diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index d1bb0977e24..f7e7689f6ed 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -68,6 +68,7 @@ import mage.client.util.Event; import mage.client.util.GUISizeHelper; import mage.client.util.Listener; import mage.constants.CardType; +import mage.constants.SuperType; import mage.util.RandomUtil; import mage.view.CardView; import mage.view.CardsView; @@ -1312,8 +1313,8 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg } // Sub & Super Types if (!s) { - for (String str : card.getSuperTypes()) { - s |= str.toLowerCase().contains(searchStr); + for (SuperType str : card.getSuperTypes()) { + s |= str.toString().toLowerCase().contains(searchStr); } for (String str : card.getSubTypes()) { s |= str.toLowerCase().contains(searchStr); @@ -1388,8 +1389,8 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg t += ' ' + type.toString(); } // Sub & Super Types - for (String str : card.getSuperTypes()) { - t += ' ' + str.toLowerCase(); + for (SuperType type : card.getSuperTypes()) { + t += ' ' + type.toString().toLowerCase(); } for (String str : card.getSubTypes()) { t += ' ' + str.toLowerCase(); @@ -1523,7 +1524,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg for (ArrayList> gridRow : cardGrid) { for (ArrayList stack : gridRow) { for (CardView card : stack) { - if (card.getSuperTypes().contains("Basic")) { + if (card.getSuperTypes().contains(SuperType.BASIC)) { continue; } diff --git a/Mage.Common/src/mage/utils/CardUtil.java b/Mage.Common/src/mage/utils/CardUtil.java index 258393b04ef..77ff22f17e7 100644 --- a/Mage.Common/src/mage/utils/CardUtil.java +++ b/Mage.Common/src/mage/utils/CardUtil.java @@ -49,14 +49,6 @@ public final class CardUtil { return card.getCardTypes().contains(type); } - public static boolean isBasicLand(Card card) { - return card.getSupertype().contains("Basic"); - } - - public static boolean isLand(Card card) { - return card.getCardType().contains(CardType.LAND); - } - public static int getColorIdentitySortValue(List manaCost, ObjectColor originalColor, List rules) { ObjectColor color = new ObjectColor(originalColor); for (String rule : rules) { diff --git a/Mage.Common/src/mage/view/AbilityView.java b/Mage.Common/src/mage/view/AbilityView.java index 2c6b61bfe83..c95d00de745 100644 --- a/Mage.Common/src/mage/view/AbilityView.java +++ b/Mage.Common/src/mage/view/AbilityView.java @@ -31,6 +31,7 @@ package mage.view; import mage.ObjectColor; import mage.abilities.Ability; import mage.constants.CardType; +import mage.constants.SuperType; import java.util.ArrayList; import java.util.EnumSet; @@ -57,7 +58,7 @@ public class AbilityView extends CardView { this.loyalty = ""; this.cardTypes = EnumSet.noneOf(CardType.class); this.subTypes = new ArrayList<>(); - this.superTypes = new ArrayList<>(); + this.superTypes =EnumSet.noneOf(SuperType.class); this.color = new ObjectColor(); this.manaCost = ability.getManaCosts().getSymbols(); } diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 82d6c397c55..757c08567fe 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -27,8 +27,6 @@ */ package mage.view; -import java.util.*; - import mage.MageObject; import mage.ObjectColor; import mage.abilities.Mode; @@ -37,11 +35,7 @@ import mage.abilities.costs.mana.ManaCosts; import mage.cards.Card; import mage.cards.FrameStyle; import mage.cards.SplitCard; -import mage.constants.AbilityType; -import mage.constants.CardType; -import mage.constants.MageObjectType; -import mage.constants.Rarity; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.Counter; import mage.counters.CounterType; import mage.designations.Designation; @@ -55,6 +49,8 @@ import mage.game.stack.StackAbility; import mage.target.Target; import mage.target.Targets; +import java.util.*; + /** * @author BetaSteward_at_googlemail.com */ @@ -72,7 +68,7 @@ public class CardView extends SimpleCardView { protected String startingLoyalty; protected EnumSet cardTypes; protected List subTypes; - protected List superTypes; + protected EnumSet superTypes; protected ObjectColor color; protected ObjectColor frameColor; protected FrameStyle frameStyle; @@ -349,7 +345,7 @@ public class CardView extends SimpleCardView { this.toughness = Integer.toString(card.getToughness().getValue()); this.cardTypes = card.getCardType(); this.subTypes = card.getSubtype(game); - this.superTypes = card.getSupertype(); + this.superTypes = card.getSuperType(); this.color = card.getColor(game); this.transformable = card.isTransformable(); this.flipCard = card.isFlipCard(); @@ -436,7 +432,7 @@ public class CardView extends SimpleCardView { } this.cardTypes = object.getCardType(); this.subTypes = object.getSubtype(null); - this.superTypes = object.getSupertype(); + this.superTypes = object.getSuperType(); this.color = object.getColor(null); this.manaCost = object.getManaCost().getSymbols(); this.convertedManaCost = object.getManaCost().convertedManaCost(); @@ -520,7 +516,7 @@ public class CardView extends SimpleCardView { this.startingLoyalty = ""; this.cardTypes = EnumSet.noneOf(CardType.class); this.subTypes = new ArrayList<>(); - this.superTypes = new ArrayList<>(); + this.superTypes = EnumSet.noneOf(SuperType.class); this.color = new ObjectColor(); this.frameColor = new ObjectColor(); this.frameStyle = FrameStyle.M15_NORMAL; @@ -567,7 +563,7 @@ public class CardView extends SimpleCardView { this.startingLoyalty = ""; this.cardTypes = token.getCardType(); this.subTypes = token.getSubtype(null); - this.superTypes = token.getSupertype(); + this.superTypes = token.getSuperType(); this.color = token.getColor(null); this.frameColor = token.getFrameColor(null); this.frameStyle = token.getFrameStyle(); @@ -647,7 +643,7 @@ public class CardView extends SimpleCardView { return subTypes; } - public List getSuperTypes() { + public EnumSet getSuperTypes() { return superTypes; } diff --git a/Mage.Common/src/mage/view/StackAbilityView.java b/Mage.Common/src/mage/view/StackAbilityView.java index a34de5abf5b..92cbc8b6c51 100644 --- a/Mage.Common/src/mage/view/StackAbilityView.java +++ b/Mage.Common/src/mage/view/StackAbilityView.java @@ -65,12 +65,12 @@ public class StackAbilityView extends CardView { this.cardTypes = ability.getCardType(); this.subTypes = ability.getSubtype(game); - this.superTypes = ability.getSupertype(); + this.superTypes = ability.getSuperType(); this.color = ability.getColor(game); this.manaCost = ability.getManaCost().getSymbols(); this.cardTypes = ability.getCardType(); this.subTypes = ability.getSubtype(game); - this.superTypes = ability.getSupertype(); + this.superTypes = ability.getSuperType(); this.color = ability.getColor(game); this.manaCost = ability.getManaCost().getSymbols(); this.power = ability.getPower().toString(); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java index fbc137c0913..0a36060891c 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java @@ -146,8 +146,8 @@ public class Commander extends Constructed { invalid.put("Commander", "Commander banned (" + commander.getName() + ')'); valid = false; } - if ((!commander.getCardType().contains(CardType.CREATURE) || !commander.getSupertype().contains("Legendary")) - && (!commander.getCardType().contains(CardType.PLANESWALKER) || !commander.getAbilities().contains(CanBeYourCommanderAbility.getInstance()))) { + if ((!commander.isCreature() || !commander.isLegendary()) + && (!commander.isPlaneswalker() || !commander.getAbilities().contains(CanBeYourCommanderAbility.getInstance()))) { invalid.put("Commander", "Commander invalid (" + commander.getName() + ')'); valid = false; } diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java index ab3b3ec42fd..6fb852e129c 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java @@ -174,8 +174,8 @@ public class TinyLeaders extends Constructed { } return false; } - if ((commander.getCardType().contains(CardType.CREATURE) && commander.getSupertype().contains("Legendary")) - || (commander.getCardType().contains(CardType.PLANESWALKER) && commander.getAbilities().contains(CanBeYourCommanderAbility.getInstance()))) { + if ((commander.isCreature() && commander.isLegendary()) + || (commander.isPlaneswalker() && commander.getAbilities().contains(CanBeYourCommanderAbility.getInstance()))) { if (!bannedCommander.contains(commander.getName())) { FilterMana color = CardUtil.getColorIdentity(commander); for (Card card : deck.getCards()) { diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 0f12ea92442..96bcfa274e0 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -1608,7 +1608,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { int cardNum = 0; while (deck.getCards().size() < 23 && sortedCards.size() > cardNum) { Card card = sortedCards.get(cardNum); - if (!card.getSupertype().contains("Basic")) { + if (!card.isBasic()) { deck.getCards().add(card); deck.getSideboard().remove(card); } diff --git a/Mage.Sets/src/mage/cards/a/AAT1.java b/Mage.Sets/src/mage/cards/a/AAT1.java index 7f3ba047c4e..f28ed341dd5 100644 --- a/Mage.Sets/src/mage/cards/a/AAT1.java +++ b/Mage.Sets/src/mage/cards/a/AAT1.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/ATST.java b/Mage.Sets/src/mage/cards/a/ATST.java index a0dfc5abcb0..ff6646cddb5 100644 --- a/Mage.Sets/src/mage/cards/a/ATST.java +++ b/Mage.Sets/src/mage/cards/a/ATST.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AWing.java b/Mage.Sets/src/mage/cards/a/AWing.java index 59a655ae90f..e88009c1ad2 100644 --- a/Mage.Sets/src/mage/cards/a/AWing.java +++ b/Mage.Sets/src/mage/cards/a/AWing.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AbandonHope.java b/Mage.Sets/src/mage/cards/a/AbandonHope.java index 1ef14327139..b7b2f336406 100644 --- a/Mage.Sets/src/mage/cards/a/AbandonHope.java +++ b/Mage.Sets/src/mage/cards/a/AbandonHope.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.target.TargetPlayer; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AbandonReason.java b/Mage.Sets/src/mage/cards/a/AbandonReason.java index ee4ce79c19d..bdeec55106e 100644 --- a/Mage.Sets/src/mage/cards/a/AbandonReason.java +++ b/Mage.Sets/src/mage/cards/a/AbandonReason.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbandonedOutpost.java b/Mage.Sets/src/mage/cards/a/AbandonedOutpost.java index 7260d310589..207ed623f2d 100644 --- a/Mage.Sets/src/mage/cards/a/AbandonedOutpost.java +++ b/Mage.Sets/src/mage/cards/a/AbandonedOutpost.java @@ -28,7 +28,6 @@ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/a/AbattoirGhoul.java b/Mage.Sets/src/mage/cards/a/AbattoirGhoul.java index cf980e7d650..ca00c4836eb 100644 --- a/Mage.Sets/src/mage/cards/a/AbattoirGhoul.java +++ b/Mage.Sets/src/mage/cards/a/AbattoirGhoul.java @@ -29,18 +29,21 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.keyword.FirstStrikeAbility; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.*; -import mage.game.Game; -import java.util.UUID; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; import mage.abilities.effects.OneShotEffect; +import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; +import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Alvin diff --git a/Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java b/Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java index f80410fa386..1d41b84ddf8 100644 --- a/Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java +++ b/Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Sir-Speshkitty diff --git a/Mage.Sets/src/mage/cards/a/AbbeyGriffin.java b/Mage.Sets/src/mage/cards/a/AbbeyGriffin.java index 5fb8f880db3..1bf179083a8 100644 --- a/Mage.Sets/src/mage/cards/a/AbbeyGriffin.java +++ b/Mage.Sets/src/mage/cards/a/AbbeyGriffin.java @@ -28,13 +28,14 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AbbeyMatron.java b/Mage.Sets/src/mage/cards/a/AbbeyMatron.java index c85d1cea253..8a009d0baee 100644 --- a/Mage.Sets/src/mage/cards/a/AbbeyMatron.java +++ b/Mage.Sets/src/mage/cards/a/AbbeyMatron.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Sir-Speshkitty diff --git a/Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java b/Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java index 3d356f51ef6..2eccf3acc64 100644 --- a/Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java +++ b/Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -48,6 +47,8 @@ import mage.players.Library; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Abduction.java b/Mage.Sets/src/mage/cards/a/Abduction.java index 61ae91b0b9d..1c7384c176c 100644 --- a/Mage.Sets/src/mage/cards/a/Abduction.java +++ b/Mage.Sets/src/mage/cards/a/Abduction.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AberrantResearcher.java b/Mage.Sets/src/mage/cards/a/AberrantResearcher.java index 30cc88245da..40b134eec56 100644 --- a/Mage.Sets/src/mage/cards/a/AberrantResearcher.java +++ b/Mage.Sets/src/mage/cards/a/AberrantResearcher.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -35,10 +34,10 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransformAbility; -import mage.cards.p.PerfectedForm; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.p.PerfectedForm; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Abeyance.java b/Mage.Sets/src/mage/cards/a/Abeyance.java index 1ef21f26fde..2ca6d881a13 100644 --- a/Mage.Sets/src/mage/cards/a/Abeyance.java +++ b/Mage.Sets/src/mage/cards/a/Abeyance.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java index f7800b70ff6..c65135e0124 100644 --- a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java +++ b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Abjure.java b/Mage.Sets/src/mage/cards/a/Abjure.java index 2c4e0026978..0b08752be80 100644 --- a/Mage.Sets/src/mage/cards/a/Abjure.java +++ b/Mage.Sets/src/mage/cards/a/Abjure.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.CounterTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author djbrez diff --git a/Mage.Sets/src/mage/cards/a/Abolish.java b/Mage.Sets/src/mage/cards/a/Abolish.java index 0217ff0c995..45bb47ca802 100644 --- a/Mage.Sets/src/mage/cards/a/Abolish.java +++ b/Mage.Sets/src/mage/cards/a/Abolish.java @@ -27,19 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AbolisherOfBloodlines.java b/Mage.Sets/src/mage/cards/a/AbolisherOfBloodlines.java index 7a4d30ee5b2..3bf504c388b 100644 --- a/Mage.Sets/src/mage/cards/a/AbolisherOfBloodlines.java +++ b/Mage.Sets/src/mage/cards/a/AbolisherOfBloodlines.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeEffect; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Abomination.java b/Mage.Sets/src/mage/cards/a/Abomination.java index e49d8f6af2f..ea1b9c9ec42 100644 --- a/Mage.Sets/src/mage/cards/a/Abomination.java +++ b/Mage.Sets/src/mage/cards/a/Abomination.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java b/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java index 7ebcaebfc39..8fa4089c9b3 100644 --- a/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java +++ b/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java @@ -27,18 +27,19 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawDiscardControllerEffect; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Aboroth.java b/Mage.Sets/src/mage/cards/a/Aboroth.java index f1ccef6cbb1..faf43473de4 100644 --- a/Mage.Sets/src/mage/cards/a/Aboroth.java +++ b/Mage.Sets/src/mage/cards/a/Aboroth.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -40,6 +39,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java index 50e639a3010..cccd1cc477e 100644 --- a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java +++ b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; @@ -48,6 +48,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author cbt33 @@ -64,7 +66,7 @@ static { public AboshanCephalidEmperor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cephalid"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AboshansDesire.java b/Mage.Sets/src/mage/cards/a/AboshansDesire.java index 0bf131a0f75..bf4e6b6eacd 100644 --- a/Mage.Sets/src/mage/cards/a/AboshansDesire.java +++ b/Mage.Sets/src/mage/cards/a/AboshansDesire.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; @@ -39,15 +38,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/a/AboutFace.java b/Mage.Sets/src/mage/cards/a/AboutFace.java index d8667f7eaa2..928e5c94d54 100644 --- a/Mage.Sets/src/mage/cards/a/AboutFace.java +++ b/Mage.Sets/src/mage/cards/a/AboutFace.java @@ -27,15 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.SwitchPowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AbruptDecay.java b/Mage.Sets/src/mage/cards/a/AbruptDecay.java index 2599f33fe7a..91086b8de58 100644 --- a/Mage.Sets/src/mage/cards/a/AbruptDecay.java +++ b/Mage.Sets/src/mage/cards/a/AbruptDecay.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -42,6 +41,8 @@ import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbsoluteGrace.java b/Mage.Sets/src/mage/cards/a/AbsoluteGrace.java index b88ebeeb7a2..96eb95c4361 100644 --- a/Mage.Sets/src/mage/cards/a/AbsoluteGrace.java +++ b/Mage.Sets/src/mage/cards/a/AbsoluteGrace.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,8 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AbsoluteLaw.java b/Mage.Sets/src/mage/cards/a/AbsoluteLaw.java index 7431c972c74..a30567d637a 100644 --- a/Mage.Sets/src/mage/cards/a/AbsoluteLaw.java +++ b/Mage.Sets/src/mage/cards/a/AbsoluteLaw.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,8 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AbsolverThrull.java b/Mage.Sets/src/mage/cards/a/AbsolverThrull.java index bdc2559b42e..a7eaea850a3 100644 --- a/Mage.Sets/src/mage/cards/a/AbsolverThrull.java +++ b/Mage.Sets/src/mage/cards/a/AbsolverThrull.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Absorb.java b/Mage.Sets/src/mage/cards/a/Absorb.java index 57e014a5017..94d0741e770 100644 --- a/Mage.Sets/src/mage/cards/a/Absorb.java +++ b/Mage.Sets/src/mage/cards/a/Absorb.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AbsorbVis.java b/Mage.Sets/src/mage/cards/a/AbsorbVis.java index 3a445d1aabb..dd3b787f31d 100644 --- a/Mage.Sets/src/mage/cards/a/AbsorbVis.java +++ b/Mage.Sets/src/mage/cards/a/AbsorbVis.java @@ -28,16 +28,17 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.BasicLandcyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AbstruseInterference.java b/Mage.Sets/src/mage/cards/a/AbstruseInterference.java index f8a6362048c..9ebdb57af45 100644 --- a/Mage.Sets/src/mage/cards/a/AbstruseInterference.java +++ b/Mage.Sets/src/mage/cards/a/AbstruseInterference.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CounterUnlessPaysEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.game.permanent.token.EldraziScionToken; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AbuJafar.java b/Mage.Sets/src/mage/cards/a/AbuJafar.java index 4f35755a9d3..18d94d0c18d 100644 --- a/Mage.Sets/src/mage/cards/a/AbuJafar.java +++ b/Mage.Sets/src/mage/cards/a/AbuJafar.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.BlockedByIdPredicate; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java b/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java index fe11e771244..38c665fb309 100644 --- a/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java +++ b/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +34,9 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/cards/a/AbunasChant.java b/Mage.Sets/src/mage/cards/a/AbunasChant.java index 16ab5f19c4a..71e78f9180e 100644 --- a/Mage.Sets/src/mage/cards/a/AbunasChant.java +++ b/Mage.Sets/src/mage/cards/a/AbunasChant.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.PreventDamageToTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/Abundance.java b/Mage.Sets/src/mage/cards/a/Abundance.java index cf999559242..c8b72c86d57 100644 --- a/Mage.Sets/src/mage/cards/a/Abundance.java +++ b/Mage.Sets/src/mage/cards/a/Abundance.java @@ -27,16 +27,11 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -48,6 +43,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java index 3857ba9afa1..7405e6976af 100644 --- a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java +++ b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/a/AbundantMaw.java b/Mage.Sets/src/mage/cards/a/AbundantMaw.java index 6b4a39b378a..c7474aeb8ec 100644 --- a/Mage.Sets/src/mage/cards/a/AbundantMaw.java +++ b/Mage.Sets/src/mage/cards/a/AbundantMaw.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java b/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java index 962e20cd9c6..31a2981773d 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author daagar diff --git a/Mage.Sets/src/mage/cards/a/AbyssalHorror.java b/Mage.Sets/src/mage/cards/a/AbyssalHorror.java index 790b7f77b53..2ee06bbfa6a 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalHorror.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalHorror.java @@ -28,8 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,8 +35,11 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AbyssalHunter.java b/Mage.Sets/src/mage/cards/a/AbyssalHunter.java index 550629cbafc..81a402cd113 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalHunter.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AbyssalNightstalker.java b/Mage.Sets/src/mage/cards/a/AbyssalNightstalker.java index ecd2235bd35..682950dd2c8 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalNightstalker.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalNightstalker.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; +import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.discard.DiscardTargetEffect; -import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java b/Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java index 47b444b8795..5b1b2aec524 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiscardsACardOpponentTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java b/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java index 0a8891f2eb8..ce7ae8bbf1c 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java @@ -27,11 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,10 +35,16 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AbyssalSpecter.java b/Mage.Sets/src/mage/cards/a/AbyssalSpecter.java index d522f6306a7..f9b5de2d920 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalSpecter.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalSpecter.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AbzanAdvantage.java b/Mage.Sets/src/mage/cards/a/AbzanAdvantage.java index 0428d851d3b..77275231d56 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanAdvantage.java +++ b/Mage.Sets/src/mage/cards/a/AbzanAdvantage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.effects.keyword.BolsterEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterEnchantmentPermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java b/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java index 863e651d5ad..7ec501a7e66 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java +++ b/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbzanBanner.java b/Mage.Sets/src/mage/cards/a/AbzanBanner.java index bd74c429f18..aac283f6298 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBanner.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBanner.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -42,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java index 352591272a4..6464a6e21c8 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java b/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java index 57b347675b8..f1b14cc54f1 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.ControlsCreatureGreatestToughnessCondition; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbzanCharm.java b/Mage.Sets/src/mage/cards/a/AbzanCharm.java index 9f81c50d365..919a30730f8 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanCharm.java +++ b/Mage.Sets/src/mage/cards/a/AbzanCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ExileTargetEffect; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java index aae186c2e5b..088a1dc15b8 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java +++ b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -36,17 +35,15 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.OutlastAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AbzanGuide.java b/Mage.Sets/src/mage/cards/a/AbzanGuide.java index 4c5aa5c3a0c..c5a33e585af 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanGuide.java +++ b/Mage.Sets/src/mage/cards/a/AbzanGuide.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.LifelinkAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java b/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java index 499297a6de2..ffbef435a90 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java +++ b/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java index 5f89e929623..fbc8336e0cf 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java +++ b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,17 +39,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java b/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java index f73e06939e8..850cabcec2b 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java +++ b/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.keyword.BolsterEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AcademyElite.java b/Mage.Sets/src/mage/cards/a/AcademyElite.java index 90de9a89081..4e7551c48d2 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyElite.java +++ b/Mage.Sets/src/mage/cards/a/AcademyElite.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterInstantOrSorceryCard; +import java.util.UUID; + /** * * @author andyfries diff --git a/Mage.Sets/src/mage/cards/a/AcademyRaider.java b/Mage.Sets/src/mage/cards/a/AcademyRaider.java index 2616949ed45..3f2eb5ab1c4 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyRaider.java +++ b/Mage.Sets/src/mage/cards/a/AcademyRaider.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AcademyRector.java b/Mage.Sets/src/mage/cards/a/AcademyRector.java index 9edfb7452fc..3fde8f27543 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyRector.java +++ b/Mage.Sets/src/mage/cards/a/AcademyRector.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.common.FilterEnchantmentCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AcademyResearchers.java b/Mage.Sets/src/mage/cards/a/AcademyResearchers.java index 9ba8e5afe0a..e3437097adc 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyResearchers.java +++ b/Mage.Sets/src/mage/cards/a/AcademyResearchers.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AcademyRuins.java b/Mage.Sets/src/mage/cards/a/AcademyRuins.java index 6b0a0bad4fb..06da8f877b8 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyRuins.java +++ b/Mage.Sets/src/mage/cards/a/AcademyRuins.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,10 +36,13 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Plopman @@ -49,7 +51,7 @@ public class AcademyRuins extends CardImpl { public AcademyRuins(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/a/Accelerate.java b/Mage.Sets/src/mage/cards/a/Accelerate.java index 801f23facaa..65e68263ec8 100644 --- a/Mage.Sets/src/mage/cards/a/Accelerate.java +++ b/Mage.Sets/src/mage/cards/a/Accelerate.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; @@ -38,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/a/AcceleratedMutation.java b/Mage.Sets/src/mage/cards/a/AcceleratedMutation.java index 055eaf61252..88bc283a214 100644 --- a/Mage.Sets/src/mage/cards/a/AcceleratedMutation.java +++ b/Mage.Sets/src/mage/cards/a/AcceleratedMutation.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -38,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/a/AcceptableLosses.java b/Mage.Sets/src/mage/cards/a/AcceptableLosses.java index e69881643b1..6405b028b95 100644 --- a/Mage.Sets/src/mage/cards/a/AcceptableLosses.java +++ b/Mage.Sets/src/mage/cards/a/AcceptableLosses.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -36,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AccomplishedAutomaton.java b/Mage.Sets/src/mage/cards/a/AccomplishedAutomaton.java index dc29c320e58..701c7e9c08d 100644 --- a/Mage.Sets/src/mage/cards/a/AccomplishedAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AccomplishedAutomaton.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FabricateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AccorderPaladin.java b/Mage.Sets/src/mage/cards/a/AccorderPaladin.java index 7b62b11e4e6..72554b2758c 100644 --- a/Mage.Sets/src/mage/cards/a/AccorderPaladin.java +++ b/Mage.Sets/src/mage/cards/a/AccorderPaladin.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BattleCryAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AccordersShield.java b/Mage.Sets/src/mage/cards/a/AccordersShield.java index 745d4c34b01..d94e839a7b4 100644 --- a/Mage.Sets/src/mage/cards/a/AccordersShield.java +++ b/Mage.Sets/src/mage/cards/a/AccordersShield.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -41,7 +37,11 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AttachmentType; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AccumulatedKnowledge.java b/Mage.Sets/src/mage/cards/a/AccumulatedKnowledge.java index ce34cccbf8c..a104301395b 100644 --- a/Mage.Sets/src/mage/cards/a/AccumulatedKnowledge.java +++ b/Mage.Sets/src/mage/cards/a/AccumulatedKnowledge.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AccursedCentaur.java b/Mage.Sets/src/mage/cards/a/AccursedCentaur.java index 29de8863c04..faacb1e1745 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedCentaur.java +++ b/Mage.Sets/src/mage/cards/a/AccursedCentaur.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.SacrificeControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Sir-Speshkitty diff --git a/Mage.Sets/src/mage/cards/a/AccursedSpirit.java b/Mage.Sets/src/mage/cards/a/AccursedSpirit.java index d090d5fc2f6..b3828b56207 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedSpirit.java +++ b/Mage.Sets/src/mage/cards/a/AccursedSpirit.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index 3535e8dda6d..cf910a5458e 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -37,21 +36,19 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.TransformAbility; -import mage.cards.i.InfectiousCurse; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.i.InfectiousCurse; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author halljared diff --git a/Mage.Sets/src/mage/cards/a/AcidRain.java b/Mage.Sets/src/mage/cards/a/AcidRain.java index 40f0ab77558..ca7bb414e48 100644 --- a/Mage.Sets/src/mage/cards/a/AcidRain.java +++ b/Mage.Sets/src/mage/cards/a/AcidRain.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java index 867f9627abf..ecd6c1c9e10 100644 --- a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java +++ b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java @@ -27,13 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersAllEffect; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.DeathtouchAbility; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -43,6 +42,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AcidWebSpider.java b/Mage.Sets/src/mage/cards/a/AcidWebSpider.java index cca0442f447..478f0647e09 100644 --- a/Mage.Sets/src/mage/cards/a/AcidWebSpider.java +++ b/Mage.Sets/src/mage/cards/a/AcidWebSpider.java @@ -28,8 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,10 +35,13 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AcidicSlime.java b/Mage.Sets/src/mage/cards/a/AcidicSlime.java index 51710d51b56..2cf813b62f7 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSlime.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSlime.java @@ -28,8 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,12 +35,15 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AcidicSliver.java b/Mage.Sets/src/mage/cards/a/AcidicSliver.java index f2aaca177f9..7a4f65a38fe 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSliver.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/a/AcidicSoil.java b/Mage.Sets/src/mage/cards/a/AcidicSoil.java index 183358cf823..28587b2cad8 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSoil.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSoil.java @@ -27,20 +27,20 @@ */ package mage.cards.a; -import java.util.List; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java b/Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java index 95f9067dda2..5e8c98b1fef 100644 --- a/Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java +++ b/Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesMonstrousTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponentsCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AcolyteOfTheInferno.java b/Mage.Sets/src/mage/cards/a/AcolyteOfTheInferno.java index 8ba1a4a5ad9..92cae0d8f95 100644 --- a/Mage.Sets/src/mage/cards/a/AcolyteOfTheInferno.java +++ b/Mage.Sets/src/mage/cards/a/AcolyteOfTheInferno.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java b/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java index 321e528d750..d7b980b9d16 100644 --- a/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java +++ b/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AcolytesReward.java b/Mage.Sets/src/mage/cards/a/AcolytesReward.java index e56a4fbb330..b9f3241ac99 100644 --- a/Mage.Sets/src/mage/cards/a/AcolytesReward.java +++ b/Mage.Sets/src/mage/cards/a/AcolytesReward.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.DevotionCount; import mage.abilities.effects.PreventionEffectImpl; @@ -43,6 +42,8 @@ import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AcornCatapult.java b/Mage.Sets/src/mage/cards/a/AcornCatapult.java index 34e7cf959c4..7c2a968c417 100644 --- a/Mage.Sets/src/mage/cards/a/AcornCatapult.java +++ b/Mage.Sets/src/mage/cards/a/AcornCatapult.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -45,6 +44,8 @@ import mage.game.permanent.token.SquirrelToken; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AcornHarvest.java b/Mage.Sets/src/mage/cards/a/AcornHarvest.java index 8a585312ed7..0a0e69443ab 100644 --- a/Mage.Sets/src/mage/cards/a/AcornHarvest.java +++ b/Mage.Sets/src/mage/cards/a/AcornHarvest.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.game.permanent.token.SquirrelToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Acquire.java b/Mage.Sets/src/mage/cards/a/Acquire.java index 9e60b967309..d2211a3320b 100644 --- a/Mage.Sets/src/mage/cards/a/Acquire.java +++ b/Mage.Sets/src/mage/cards/a/Acquire.java @@ -1,6 +1,5 @@ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -16,6 +15,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * @author andyfries */ diff --git a/Mage.Sets/src/mage/cards/a/AcquireTarget.java b/Mage.Sets/src/mage/cards/a/AcquireTarget.java index 67237398314..803d8554313 100644 --- a/Mage.Sets/src/mage/cards/a/AcquireTarget.java +++ b/Mage.Sets/src/mage/cards/a/AcquireTarget.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; @@ -40,6 +39,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetOpponentsCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/Acridian.java b/Mage.Sets/src/mage/cards/a/Acridian.java index aa19e50e160..0b25241fd20 100644 --- a/Mage.Sets/src/mage/cards/a/Acridian.java +++ b/Mage.Sets/src/mage/cards/a/Acridian.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AcrobaticManeuver.java b/Mage.Sets/src/mage/cards/a/AcrobaticManeuver.java index f5cc01b33f2..b1338a5ec4c 100644 --- a/Mage.Sets/src/mage/cards/a/AcrobaticManeuver.java +++ b/Mage.Sets/src/mage/cards/a/AcrobaticManeuver.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ExileTargetForSourceEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ActOfAggression.java b/Mage.Sets/src/mage/cards/a/ActOfAggression.java index f8e9df80eed..96b34508054 100644 --- a/Mage.Sets/src/mage/cards/a/ActOfAggression.java +++ b/Mage.Sets/src/mage/cards/a/ActOfAggression.java @@ -27,20 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ActOfAuthority.java b/Mage.Sets/src/mage/cards/a/ActOfAuthority.java index bb4419754b3..d66ae095a23 100644 --- a/Mage.Sets/src/mage/cards/a/ActOfAuthority.java +++ b/Mage.Sets/src/mage/cards/a/ActOfAuthority.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,18 +37,15 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ActOfTreason.java b/Mage.Sets/src/mage/cards/a/ActOfTreason.java index 278e06a5048..8aaa9854fdc 100644 --- a/Mage.Sets/src/mage/cards/a/ActOfTreason.java +++ b/Mage.Sets/src/mage/cards/a/ActOfTreason.java @@ -28,17 +28,18 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; +import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; -import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/ActOnImpulse.java b/Mage.Sets/src/mage/cards/a/ActOnImpulse.java index 8fba52dd918..1755538578c 100644 --- a/Mage.Sets/src/mage/cards/a/ActOnImpulse.java +++ b/Mage.Sets/src/mage/cards/a/ActOnImpulse.java @@ -27,24 +27,21 @@ */ package mage.cards.a; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Library; import mage.players.Player; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/ActiveVolcano.java b/Mage.Sets/src/mage/cards/a/ActiveVolcano.java index edd7d3f55bf..b260c74dc90 100644 --- a/Mage.Sets/src/mage/cards/a/ActiveVolcano.java +++ b/Mage.Sets/src/mage/cards/a/ActiveVolcano.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AdNauseam.java b/Mage.Sets/src/mage/cards/a/AdNauseam.java index 9afb29c2392..12da870b7ed 100644 --- a/Mage.Sets/src/mage/cards/a/AdNauseam.java +++ b/Mage.Sets/src/mage/cards/a/AdNauseam.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -41,6 +39,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * @author North */ diff --git a/Mage.Sets/src/mage/cards/a/AdamaroFirstToDesire.java b/Mage.Sets/src/mage/cards/a/AdamaroFirstToDesire.java index 90249c07de5..532e7c38bcd 100644 --- a/Mage.Sets/src/mage/cards/a/AdamaroFirstToDesire.java +++ b/Mage.Sets/src/mage/cards/a/AdamaroFirstToDesire.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -38,10 +37,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -50,7 +52,7 @@ public class AdamaroFirstToDesire extends CardImpl { public AdamaroFirstToDesire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java index 2cd05794a68..f31cec391e2 100644 --- a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -38,19 +37,14 @@ import mage.abilities.effects.common.continuous.BoostAllOfChosenSubtypeEffect; import mage.abilities.effects.common.enterAttribute.EnterAttributeAddChosenSubtypeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.EnterEventType; -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.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java b/Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java index e07cf113ad6..3eaaa275611 100644 --- a/Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java +++ b/Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java b/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java index ec8accb442d..e32f2c94cd2 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Sir-Speshkitty diff --git a/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java b/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java index 3f6dcfe43c6..93d0db0abbb 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -39,10 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -53,6 +49,8 @@ import mage.target.Target; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -67,7 +65,7 @@ public class AdarkarValkyrie extends CardImpl { public AdarkarValkyrie(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Angel"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AdarkarWastes.java b/Mage.Sets/src/mage/cards/a/AdarkarWastes.java index 71d9e9f9c54..1034b3a646b 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarWastes.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarWastes.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AdarkarWindform.java b/Mage.Sets/src/mage/cards/a/AdarkarWindform.java index a5fed04149f..9e4f345d458 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarWindform.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarWindform.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +37,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -49,7 +51,7 @@ public class AdarkarWindform extends CardImpl { public AdarkarWindform(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Illusion"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java b/Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java index 68daeda3cf7..b65937dfd92 100644 --- a/Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java +++ b/Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DoIfClashWonEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Addle.java b/Mage.Sets/src/mage/cards/a/Addle.java index afd3f43a090..1db6100ce0f 100644 --- a/Mage.Sets/src/mage/cards/a/Addle.java +++ b/Mage.Sets/src/mage/cards/a/Addle.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.Effect; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java b/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java index 4a9688b3928..823dc3b0f41 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AttacksWithCreaturesTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.keyword.SpaceflightAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -49,6 +49,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Styxo @@ -63,7 +65,7 @@ public class AdmiralAckbar extends CardImpl { public AdmiralAckbar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Calamari"); this.subtype.add("Rebel"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java b/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java index fe6aa2b967f..c6405997cbd 100644 --- a/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java +++ b/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -40,6 +37,7 @@ import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -47,6 +45,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java b/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java index 7fd967d6764..a62199e0be4 100644 --- a/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java +++ b/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -36,9 +35,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -47,7 +49,7 @@ public class AdrianaCaptainOfTheGuard extends CardImpl { public AdrianaCaptainOfTheGuard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AdroitHateflayer.java b/Mage.Sets/src/mage/cards/a/AdroitHateflayer.java index f99bd5c9ce5..4dadec6e038 100644 --- a/Mage.Sets/src/mage/cards/a/AdroitHateflayer.java +++ b/Mage.Sets/src/mage/cards/a/AdroitHateflayer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.LoseLifeOpponentsEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AdunOakenshield.java b/Mage.Sets/src/mage/cards/a/AdunOakenshield.java index 27732956e3a..f6dcf22cd11 100644 --- a/Mage.Sets/src/mage/cards/a/AdunOakenshield.java +++ b/Mage.Sets/src/mage/cards/a/AdunOakenshield.java @@ -27,17 +27,18 @@ */ package mage.cards.a; +import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.MageInt; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; @@ -52,7 +53,7 @@ public class AdunOakenshield extends CardImpl { public AdunOakenshield(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/cards/a/AdvanceScout.java b/Mage.Sets/src/mage/cards/a/AdvanceScout.java index 35d01e0dae5..9386a4ecb01 100644 --- a/Mage.Sets/src/mage/cards/a/AdvanceScout.java +++ b/Mage.Sets/src/mage/cards/a/AdvanceScout.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,8 +35,14 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java b/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java index 47dfcaf289a..f8356de3543 100644 --- a/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java +++ b/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java b/Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java index caa84f1d10f..d42bc2ed03f 100644 --- a/Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java +++ b/Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java b/Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java index 6b0c2920ea2..f6449dec773 100644 --- a/Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java +++ b/Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java @@ -28,13 +28,14 @@ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.WurmToken2; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AdventuringGear.java b/Mage.Sets/src/mage/cards/a/AdventuringGear.java index 4eb8369ea9d..12223692029 100644 --- a/Mage.Sets/src/mage/cards/a/AdventuringGear.java +++ b/Mage.Sets/src/mage/cards/a/AdventuringGear.java @@ -28,21 +28,22 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; import mage.abilities.common.LandfallAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AdverseConditions.java b/Mage.Sets/src/mage/cards/a/AdverseConditions.java index bbb6f28945f..8e24bf293fa 100644 --- a/Mage.Sets/src/mage/cards/a/AdverseConditions.java +++ b/Mage.Sets/src/mage/cards/a/AdverseConditions.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.game.permanent.token.EldraziScionToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java b/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java index 49927fb1500..fdc7dd46074 100644 --- a/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java +++ b/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java @@ -27,17 +27,10 @@ */ package mage.cards.a; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -49,6 +42,10 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java index d9d0880178c..20a547dfcf6 100644 --- a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java +++ b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AegisAngel.java b/Mage.Sets/src/mage/cards/a/AegisAngel.java index 27340f8a861..c5afe3ec76d 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAngel.java +++ b/Mage.Sets/src/mage/cards/a/AegisAngel.java @@ -27,10 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,10 +37,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java index 2f5422b4524..3c14534ad38 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AegisOfHonor.java b/Mage.Sets/src/mage/cards/a/AegisOfHonor.java index 930dc4e5e30..46abf0ff92c 100644 --- a/Mage.Sets/src/mage/cards/a/AegisOfHonor.java +++ b/Mage.Sets/src/mage/cards/a/AegisOfHonor.java @@ -30,7 +30,6 @@ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -47,6 +46,8 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.target.TargetPlayer; +import java.util.UUID; + /** * @author cbt33 / LevelX2 */ diff --git a/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java b/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java index 0dc9cecc592..fe416284e6c 100644 --- a/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java +++ b/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java b/Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java index 83434483563..d3334f2b296 100644 --- a/Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java +++ b/Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Leathios diff --git a/Mage.Sets/src/mage/cards/a/Aeolipile.java b/Mage.Sets/src/mage/cards/a/Aeolipile.java index 65f30d2b696..2585584d07a 100644 --- a/Mage.Sets/src/mage/cards/a/Aeolipile.java +++ b/Mage.Sets/src/mage/cards/a/Aeolipile.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AeonChronicler.java b/Mage.Sets/src/mage/cards/a/AeonChronicler.java index 021ad499ac6..da2c876c7a2 100644 --- a/Mage.Sets/src/mage/cards/a/AeonChronicler.java +++ b/Mage.Sets/src/mage/cards/a/AeonChronicler.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +45,9 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AerathiBerserker.java b/Mage.Sets/src/mage/cards/a/AerathiBerserker.java index c29d62c28a0..7e17be1e9cd 100644 --- a/Mage.Sets/src/mage/cards/a/AerathiBerserker.java +++ b/Mage.Sets/src/mage/cards/a/AerathiBerserker.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.RampageAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AerialFormation.java b/Mage.Sets/src/mage/cards/a/AerialFormation.java index 8d9b3e390f9..4e3f082941b 100644 --- a/Mage.Sets/src/mage/cards/a/AerialFormation.java +++ b/Mage.Sets/src/mage/cards/a/AerialFormation.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.abilityword.StriveAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AerialManeuver.java b/Mage.Sets/src/mage/cards/a/AerialManeuver.java index c7b10b65de9..91d17acee47 100644 --- a/Mage.Sets/src/mage/cards/a/AerialManeuver.java +++ b/Mage.Sets/src/mage/cards/a/AerialManeuver.java @@ -27,17 +27,18 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AerialModification.java b/Mage.Sets/src/mage/cards/a/AerialModification.java index 95e85f7a146..1720c2c87bd 100644 --- a/Mage.Sets/src/mage/cards/a/AerialModification.java +++ b/Mage.Sets/src/mage/cards/a/AerialModification.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -39,13 +38,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -54,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AerialPredation.java b/Mage.Sets/src/mage/cards/a/AerialPredation.java index c8998f22d64..33ad05abd0b 100644 --- a/Mage.Sets/src/mage/cards/a/AerialPredation.java +++ b/Mage.Sets/src/mage/cards/a/AerialPredation.java @@ -29,17 +29,18 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AerialResponder.java b/Mage.Sets/src/mage/cards/a/AerialResponder.java index f3ff4c0651e..58c6a4c0b80 100644 --- a/Mage.Sets/src/mage/cards/a/AerialResponder.java +++ b/Mage.Sets/src/mage/cards/a/AerialResponder.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.LifelinkAbility; +import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AerialVolley.java b/Mage.Sets/src/mage/cards/a/AerialVolley.java index c09b2378308..85d194ba865 100644 --- a/Mage.Sets/src/mage/cards/a/AerialVolley.java +++ b/Mage.Sets/src/mage/cards/a/AerialVolley.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; import mage.abilities.keyword.FlyingAbility; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java index a62e07d94a3..bef91f7cfb8 100644 --- a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java +++ b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MorphAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AerieMystics.java b/Mage.Sets/src/mage/cards/a/AerieMystics.java index f5bf3e0d16b..ae180b510a9 100644 --- a/Mage.Sets/src/mage/cards/a/AerieMystics.java +++ b/Mage.Sets/src/mage/cards/a/AerieMystics.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,8 +36,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AerieOuphes.java b/Mage.Sets/src/mage/cards/a/AerieOuphes.java index d9ac6d7d403..211f8d0a46c 100644 --- a/Mage.Sets/src/mage/cards/a/AerieOuphes.java +++ b/Mage.Sets/src/mage/cards/a/AerieOuphes.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AerieWorshippers.java b/Mage.Sets/src/mage/cards/a/AerieWorshippers.java index 336b0edfb4a..54f1123d2fb 100644 --- a/Mage.Sets/src/mage/cards/a/AerieWorshippers.java +++ b/Mage.Sets/src/mage/cards/a/AerieWorshippers.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java index 1ed4b188133..c055ab8db1c 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java +++ b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author JRHerlehy diff --git a/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java b/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java index e78f583770d..1bff0073d67 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java +++ b/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AesthirGlider.java b/Mage.Sets/src/mage/cards/a/AesthirGlider.java index a33ef3abddf..6c5e702ae6e 100644 --- a/Mage.Sets/src/mage/cards/a/AesthirGlider.java +++ b/Mage.Sets/src/mage/cards/a/AesthirGlider.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Sir-Speshkitty diff --git a/Mage.Sets/src/mage/cards/a/AetherAdept.java b/Mage.Sets/src/mage/cards/a/AetherAdept.java index 8a36af63abc..0dcb96adae8 100644 --- a/Mage.Sets/src/mage/cards/a/AetherAdept.java +++ b/Mage.Sets/src/mage/cards/a/AetherAdept.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AetherBarrier.java b/Mage.Sets/src/mage/cards/a/AetherBarrier.java index d3bb1c3d57f..1bfe5a25059 100644 --- a/Mage.Sets/src/mage/cards/a/AetherBarrier.java +++ b/Mage.Sets/src/mage/cards/a/AetherBarrier.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -42,6 +41,8 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/a/AetherBurst.java b/Mage.Sets/src/mage/cards/a/AetherBurst.java index cda86d5f0dc..ee68c96142d 100644 --- a/Mage.Sets/src/mage/cards/a/AetherBurst.java +++ b/Mage.Sets/src/mage/cards/a/AetherBurst.java @@ -27,12 +27,12 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; diff --git a/Mage.Sets/src/mage/cards/a/AetherCharge.java b/Mage.Sets/src/mage/cards/a/AetherCharge.java index d6bd6327384..b859d417491 100644 --- a/Mage.Sets/src/mage/cards/a/AetherCharge.java +++ b/Mage.Sets/src/mage/cards/a/AetherCharge.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/a/AetherFigment.java b/Mage.Sets/src/mage/cards/a/AetherFigment.java index 691ebf27d93..0b998bdf41c 100644 --- a/Mage.Sets/src/mage/cards/a/AetherFigment.java +++ b/Mage.Sets/src/mage/cards/a/AetherFigment.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * @author nantuko, BetaSteward_at_googlemail.com */ diff --git a/Mage.Sets/src/mage/cards/a/AetherFlash.java b/Mage.Sets/src/mage/cards/a/AetherFlash.java index 0cdd6ca1e07..8df2d004674 100644 --- a/Mage.Sets/src/mage/cards/a/AetherFlash.java +++ b/Mage.Sets/src/mage/cards/a/AetherFlash.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -42,6 +41,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AetherGale.java b/Mage.Sets/src/mage/cards/a/AetherGale.java index 0b9b6fa659c..743458eb1e6 100644 --- a/Mage.Sets/src/mage/cards/a/AetherGale.java +++ b/Mage.Sets/src/mage/cards/a/AetherGale.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterNonlandPermanent; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AetherHerder.java b/Mage.Sets/src/mage/cards/a/AetherHerder.java index 6c4cf1ed634..aa56408e762 100644 --- a/Mage.Sets/src/mage/cards/a/AetherHerder.java +++ b/Mage.Sets/src/mage/cards/a/AetherHerder.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ServoToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AetherHub.java b/Mage.Sets/src/mage/cards/a/AetherHub.java index 08fc1060f23..22fed1dc75c 100644 --- a/Mage.Sets/src/mage/cards/a/AetherHub.java +++ b/Mage.Sets/src/mage/cards/a/AetherHub.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.PayEnergyCost; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AetherInspector.java b/Mage.Sets/src/mage/cards/a/AetherInspector.java index 40d6ba7ff4b..47179e8e1e8 100644 --- a/Mage.Sets/src/mage/cards/a/AetherInspector.java +++ b/Mage.Sets/src/mage/cards/a/AetherInspector.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ServoToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java index 4adefd68624..f855c4bfe4a 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java +++ b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -49,6 +48,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AetherMembrane.java b/Mage.Sets/src/mage/cards/a/AetherMembrane.java index 555dc7e4016..150489303a2 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMembrane.java +++ b/Mage.Sets/src/mage/cards/a/AetherMembrane.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author klayhamn diff --git a/Mage.Sets/src/mage/cards/a/AetherMutation.java b/Mage.Sets/src/mage/cards/a/AetherMutation.java index 92395cf533c..11ca991ed9e 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMutation.java +++ b/Mage.Sets/src/mage/cards/a/AetherMutation.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AetherPoisoner.java b/Mage.Sets/src/mage/cards/a/AetherPoisoner.java index 41deabc9286..2f6ccfedd4e 100644 --- a/Mage.Sets/src/mage/cards/a/AetherPoisoner.java +++ b/Mage.Sets/src/mage/cards/a/AetherPoisoner.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ServoToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AetherRift.java b/Mage.Sets/src/mage/cards/a/AetherRift.java index fb20db061b5..9bbb6ed4495 100644 --- a/Mage.Sets/src/mage/cards/a/AetherRift.java +++ b/Mage.Sets/src/mage/cards/a/AetherRift.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.PayLifeCost; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AetherShockwave.java b/Mage.Sets/src/mage/cards/a/AetherShockwave.java index de40c16a31e..a54e3f076dd 100644 --- a/Mage.Sets/src/mage/cards/a/AetherShockwave.java +++ b/Mage.Sets/src/mage/cards/a/AetherShockwave.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.TapAllEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AetherSnap.java b/Mage.Sets/src/mage/cards/a/AetherSnap.java index cebece2b9c6..e5ef25a60b6 100644 --- a/Mage.Sets/src/mage/cards/a/AetherSnap.java +++ b/Mage.Sets/src/mage/cards/a/AetherSnap.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AetherSpellbomb.java b/Mage.Sets/src/mage/cards/a/AetherSpellbomb.java index d28520fc6f7..a9e4ea554df 100644 --- a/Mage.Sets/src/mage/cards/a/AetherSpellbomb.java +++ b/Mage.Sets/src/mage/cards/a/AetherSpellbomb.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -38,8 +35,12 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AetherSting.java b/Mage.Sets/src/mage/cards/a/AetherSting.java index 3cbd5464636..253a116d840 100644 --- a/Mage.Sets/src/mage/cards/a/AetherSting.java +++ b/Mage.Sets/src/mage/cards/a/AetherSting.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.Card; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AetherSwooper.java b/Mage.Sets/src/mage/cards/a/AetherSwooper.java index f5c6d85d38f..b941ab9043d 100644 --- a/Mage.Sets/src/mage/cards/a/AetherSwooper.java +++ b/Mage.Sets/src/mage/cards/a/AetherSwooper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ServoToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AetherTheorist.java b/Mage.Sets/src/mage/cards/a/AetherTheorist.java index 39d3fd967a5..7cb52bb6aaa 100644 --- a/Mage.Sets/src/mage/cards/a/AetherTheorist.java +++ b/Mage.Sets/src/mage/cards/a/AetherTheorist.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AetherTradewinds.java b/Mage.Sets/src/mage/cards/a/AetherTradewinds.java index 1b684184d63..5573866653c 100644 --- a/Mage.Sets/src/mage/cards/a/AetherTradewinds.java +++ b/Mage.Sets/src/mage/cards/a/AetherTradewinds.java @@ -27,17 +27,19 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AetherVial.java b/Mage.Sets/src/mage/cards/a/AetherVial.java index 7e9fb3e9445..b4541eac3ca 100644 --- a/Mage.Sets/src/mage/cards/a/AetherVial.java +++ b/Mage.Sets/src/mage/cards/a/AetherVial.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -50,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java index 0237247f082..54f7f010aba 100644 --- a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java +++ b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java b/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java index 3418259ab83..67a8a6c28ca 100644 --- a/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java +++ b/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.CastSpellLastTurnWatcher; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AethergeodeMiner.java b/Mage.Sets/src/mage/cards/a/AethergeodeMiner.java index 59d21a80d3c..cb1100d3913 100644 --- a/Mage.Sets/src/mage/cards/a/AethergeodeMiner.java +++ b/Mage.Sets/src/mage/cards/a/AethergeodeMiner.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Aetherize.java b/Mage.Sets/src/mage/cards/a/Aetherize.java index 77256c825ab..b01cfdfb2f3 100644 --- a/Mage.Sets/src/mage/cards/a/Aetherize.java +++ b/Mage.Sets/src/mage/cards/a/Aetherize.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Aetherling.java b/Mage.Sets/src/mage/cards/a/Aetherling.java index 9396b2977e4..2f5b3578b04 100644 --- a/Mage.Sets/src/mage/cards/a/Aetherling.java +++ b/Mage.Sets/src/mage/cards/a/Aetherling.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AethermagesTouch.java b/Mage.Sets/src/mage/cards/a/AethermagesTouch.java index 53848d4bdc9..776f5896fff 100644 --- a/Mage.Sets/src/mage/cards/a/AethermagesTouch.java +++ b/Mage.Sets/src/mage/cards/a/AethermagesTouch.java @@ -27,29 +27,22 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Aethersnatch.java b/Mage.Sets/src/mage/cards/a/Aethersnatch.java index 66ac753daf0..45d0f3029f7 100644 --- a/Mage.Sets/src/mage/cards/a/Aethersnatch.java +++ b/Mage.Sets/src/mage/cards/a/Aethersnatch.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/Aethersnipe.java b/Mage.Sets/src/mage/cards/a/Aethersnipe.java index 5090cf9c46c..c501395a13f 100644 --- a/Mage.Sets/src/mage/cards/a/Aethersnipe.java +++ b/Mage.Sets/src/mage/cards/a/Aethersnipe.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,9 +34,12 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.Target; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java b/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java index 2b66393b51f..9505c773b9e 100644 --- a/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java +++ b/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java @@ -27,15 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayEnergyCost; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.CrewAbility; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Aetherspouts.java b/Mage.Sets/src/mage/cards/a/Aetherspouts.java index 97833813796..1eb81fd8160 100644 --- a/Mage.Sets/src/mage/cards/a/Aetherspouts.java +++ b/Mage.Sets/src/mage/cards/a/Aetherspouts.java @@ -27,15 +27,9 @@ */ package mage.cards.a; -import java.util.ArrayList; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -48,6 +42,9 @@ import mage.players.Player; import mage.players.PlayerList; import mage.target.TargetCard; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AethersquallAncient.java b/Mage.Sets/src/mage/cards/a/AethersquallAncient.java index 460411f4b5f..a001b309949 100644 --- a/Mage.Sets/src/mage/cards/a/AethersquallAncient.java +++ b/Mage.Sets/src/mage/cards/a/AethersquallAncient.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AetherstormRoc.java b/Mage.Sets/src/mage/cards/a/AetherstormRoc.java index bdb8ce9573c..660b527663c 100644 --- a/Mage.Sets/src/mage/cards/a/AetherstormRoc.java +++ b/Mage.Sets/src/mage/cards/a/AetherstormRoc.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AetherstreamLeopard.java b/Mage.Sets/src/mage/cards/a/AetherstreamLeopard.java index 865d5dea827..481d88251c1 100644 --- a/Mage.Sets/src/mage/cards/a/AetherstreamLeopard.java +++ b/Mage.Sets/src/mage/cards/a/AetherstreamLeopard.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AethertideWhale.java b/Mage.Sets/src/mage/cards/a/AethertideWhale.java index 5c209a56154..35d5c957d8e 100644 --- a/Mage.Sets/src/mage/cards/a/AethertideWhale.java +++ b/Mage.Sets/src/mage/cards/a/AethertideWhale.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java b/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java index a787d694923..bcb6b6e6c4b 100644 --- a/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java +++ b/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Aethertow.java b/Mage.Sets/src/mage/cards/a/Aethertow.java index b2c0f33f187..f1b65b10a2f 100644 --- a/Mage.Sets/src/mage/cards/a/Aethertow.java +++ b/Mage.Sets/src/mage/cards/a/Aethertow.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ConspireAbility; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AetherwindBasker.java b/Mage.Sets/src/mage/cards/a/AetherwindBasker.java index ac0f7345d9e..83841bac2bc 100644 --- a/Mage.Sets/src/mage/cards/a/AetherwindBasker.java +++ b/Mage.Sets/src/mage/cards/a/AetherwindBasker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AetherworksMarvel.java b/Mage.Sets/src/mage/cards/a/AetherworksMarvel.java index 2e8c4981430..d5b84fef2cd 100644 --- a/Mage.Sets/src/mage/cards/a/AetherworksMarvel.java +++ b/Mage.Sets/src/mage/cards/a/AetherworksMarvel.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -36,13 +34,10 @@ import mage.abilities.costs.common.PayEnergyCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterNonlandCard; @@ -51,6 +46,9 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; +import java.util.Set; +import java.util.UUID; + /** * * @author emerald000 @@ -59,7 +57,7 @@ public class AetherworksMarvel extends CardImpl { public AetherworksMarvel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Whenever a permanent you control is put into a graveyard, you get {E}. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new GetEnergyCountersControllerEffect(1), false, new FilterControlledPermanent("a permanent you control"), false)); diff --git a/Mage.Sets/src/mage/cards/a/AffaGuardHound.java b/Mage.Sets/src/mage/cards/a/AffaGuardHound.java index ed428cf6440..aadc5534527 100644 --- a/Mage.Sets/src/mage/cards/a/AffaGuardHound.java +++ b/Mage.Sets/src/mage/cards/a/AffaGuardHound.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,8 +35,12 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AffaProtector.java b/Mage.Sets/src/mage/cards/a/AffaProtector.java index aa197f3fb2d..d9444a06677 100644 --- a/Mage.Sets/src/mage/cards/a/AffaProtector.java +++ b/Mage.Sets/src/mage/cards/a/AffaProtector.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Afflict.java b/Mage.Sets/src/mage/cards/a/Afflict.java index 25662ad3464..daa22560e74 100644 --- a/Mage.Sets/src/mage/cards/a/Afflict.java +++ b/Mage.Sets/src/mage/cards/a/Afflict.java @@ -27,16 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AfflictedDeserter.java b/Mage.Sets/src/mage/cards/a/AfflictedDeserter.java index bb19cc0352b..ca60b726550 100644 --- a/Mage.Sets/src/mage/cards/a/AfflictedDeserter.java +++ b/Mage.Sets/src/mage/cards/a/AfflictedDeserter.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -35,12 +34,14 @@ import mage.abilities.condition.common.NoSpellsWereCastLastTurnCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.w.WerewolfRansacker; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.w.WerewolfRansacker; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/a/Afterlife.java b/Mage.Sets/src/mage/cards/a/Afterlife.java index 33df33168c8..3139fa9a7bb 100644 --- a/Mage.Sets/src/mage/cards/a/Afterlife.java +++ b/Mage.Sets/src/mage/cards/a/Afterlife.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.SpiritWhiteToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/Aftershock.java b/Mage.Sets/src/mage/cards/a/Aftershock.java index 8fa1097240a..dbe9effdb47 100644 --- a/Mage.Sets/src/mage/cards/a/Aftershock.java +++ b/Mage.Sets/src/mage/cards/a/Aftershock.java @@ -27,17 +27,18 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java b/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java index bbcb04a587d..8da5b4f9969 100644 --- a/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java +++ b/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInOpponentsGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AgelessEntity.java b/Mage.Sets/src/mage/cards/a/AgelessEntity.java index 06646c8a791..9d3c3e17d66 100644 --- a/Mage.Sets/src/mage/cards/a/AgelessEntity.java +++ b/Mage.Sets/src/mage/cards/a/AgelessEntity.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.GainLifeControllerTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AgentOfErebos.java b/Mage.Sets/src/mage/cards/a/AgentOfErebos.java index 5ffa39e69e2..7932161e1b9 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfErebos.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfErebos.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.abilityword.ConstellationAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java b/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java index d620c123191..3721d71c7b4 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AgentOfMasks.java b/Mage.Sets/src/mage/cards/a/AgentOfMasks.java index 64d50d5cb11..82358f4e81c 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfMasks.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfMasks.java @@ -27,19 +27,19 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.game.Game; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AgentOfShauku.java b/Mage.Sets/src/mage/cards/a/AgentOfShauku.java index 0496196cd84..48067f7383e 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfShauku.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfShauku.java @@ -27,10 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +35,16 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java b/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java index 22bd45bf408..543af088c9b 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AgentOfTheFates.java b/Mage.Sets/src/mage/cards/a/AgentOfTheFates.java index 2162b29695c..524f7b9835b 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfTheFates.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfTheFates.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.SacrificeOpponentsEffect; import mage.abilities.keyword.DeathtouchAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Aggravate.java b/Mage.Sets/src/mage/cards/a/Aggravate.java index ba4826ab1af..10c3302621f 100644 --- a/Mage.Sets/src/mage/cards/a/Aggravate.java +++ b/Mage.Sets/src/mage/cards/a/Aggravate.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.common.DamageAllControlledTargetEffect; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPlayer; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AggressiveMining.java b/Mage.Sets/src/mage/cards/a/AggressiveMining.java index 3e053d70f96..7680fcc9ea3 100644 --- a/Mage.Sets/src/mage/cards/a/AggressiveMining.java +++ b/Mage.Sets/src/mage/cards/a/AggressiveMining.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AggressiveUrge.java b/Mage.Sets/src/mage/cards/a/AggressiveUrge.java index 5037f9e677c..7575d2f5c6d 100644 --- a/Mage.Sets/src/mage/cards/a/AggressiveUrge.java +++ b/Mage.Sets/src/mage/cards/a/AggressiveUrge.java @@ -27,16 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/Agility.java b/Mage.Sets/src/mage/cards/a/Agility.java index 7572e8e7beb..4c8636bb2fc 100644 --- a/Mage.Sets/src/mage/cards/a/Agility.java +++ b/Mage.Sets/src/mage/cards/a/Agility.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -39,9 +36,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AgonizingDemise.java b/Mage.Sets/src/mage/cards/a/AgonizingDemise.java index 75920cd7f20..ea38c817eef 100644 --- a/Mage.Sets/src/mage/cards/a/AgonizingDemise.java +++ b/Mage.Sets/src/mage/cards/a/AgonizingDemise.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/a/AgonizingMemories.java b/Mage.Sets/src/mage/cards/a/AgonizingMemories.java index afc34c70fd1..3a2eec81a4a 100644 --- a/Mage.Sets/src/mage/cards/a/AgonizingMemories.java +++ b/Mage.Sets/src/mage/cards/a/AgonizingMemories.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -42,6 +41,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AgonyWarp.java b/Mage.Sets/src/mage/cards/a/AgonyWarp.java index 55ea8f42f1a..b2b99fe37a0 100644 --- a/Mage.Sets/src/mage/cards/a/AgonyWarp.java +++ b/Mage.Sets/src/mage/cards/a/AgonyWarp.java @@ -27,18 +27,19 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/Agoraphobia.java b/Mage.Sets/src/mage/cards/a/Agoraphobia.java index 6fa6fc11e8f..cae80146e36 100644 --- a/Mage.Sets/src/mage/cards/a/Agoraphobia.java +++ b/Mage.Sets/src/mage/cards/a/Agoraphobia.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,11 +37,14 @@ 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.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java b/Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java index f6156595fa9..b0d46b4f75e 100644 --- a/Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java +++ b/Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java @@ -27,19 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Loki @@ -57,7 +58,7 @@ public class AgrusKosWojekVeteran extends CardImpl { public AgrusKosWojekVeteran(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java b/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java index c6c2344523b..50a9ab8df40 100644 --- a/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java +++ b/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -35,11 +34,7 @@ import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -48,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.watchers.common.RevoltWatcher; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AimHigh.java b/Mage.Sets/src/mage/cards/a/AimHigh.java index 1b2ae2d3793..aee13be28af 100644 --- a/Mage.Sets/src/mage/cards/a/AimHigh.java +++ b/Mage.Sets/src/mage/cards/a/AimHigh.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java index d2d86a9d6b7..5e469030fd3 100644 --- a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java +++ b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasCounterCondition; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AinokBondKin.java b/Mage.Sets/src/mage/cards/a/AinokBondKin.java index 2de64123d57..9465fee00f4 100644 --- a/Mage.Sets/src/mage/cards/a/AinokBondKin.java +++ b/Mage.Sets/src/mage/cards/a/AinokBondKin.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AinokGuide.java b/Mage.Sets/src/mage/cards/a/AinokGuide.java index 262c5e7bb9d..396392300b3 100644 --- a/Mage.Sets/src/mage/cards/a/AinokGuide.java +++ b/Mage.Sets/src/mage/cards/a/AinokGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -41,6 +40,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java index 0f8160970fb..7c9b381a161 100644 --- a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java +++ b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AinokTracker.java b/Mage.Sets/src/mage/cards/a/AinokTracker.java index 4e8edb68c15..97c5e7dac63 100644 --- a/Mage.Sets/src/mage/cards/a/AinokTracker.java +++ b/Mage.Sets/src/mage/cards/a/AinokTracker.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AirElemental.java b/Mage.Sets/src/mage/cards/a/AirElemental.java index 81d8ce8e03b..fd5f1d825f7 100644 --- a/Mage.Sets/src/mage/cards/a/AirElemental.java +++ b/Mage.Sets/src/mage/cards/a/AirElemental.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AirServant.java b/Mage.Sets/src/mage/cards/a/AirServant.java index 4380a023907..4ae643900e0 100644 --- a/Mage.Sets/src/mage/cards/a/AirServant.java +++ b/Mage.Sets/src/mage/cards/a/AirServant.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,10 +36,14 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AirborneAid.java b/Mage.Sets/src/mage/cards/a/AirborneAid.java index 99bdb2b9d28..73b1f416d82 100644 --- a/Mage.Sets/src/mage/cards/a/AirborneAid.java +++ b/Mage.Sets/src/mage/cards/a/AirborneAid.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java b/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java index 302257eb7d8..06c5df0a71d 100644 --- a/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java +++ b/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.watchers.common.RevoltWatcher; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AirdropCondor.java b/Mage.Sets/src/mage/cards/a/AirdropCondor.java index eb4a7665f07..73b468bca68 100644 --- a/Mage.Sets/src/mage/cards/a/AirdropCondor.java +++ b/Mage.Sets/src/mage/cards/a/AirdropCondor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AislingLeprechaun.java b/Mage.Sets/src/mage/cards/a/AislingLeprechaun.java index b2f1babbc24..a248deafc6b 100644 --- a/Mage.Sets/src/mage/cards/a/AislingLeprechaun.java +++ b/Mage.Sets/src/mage/cards/a/AislingLeprechaun.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author djbrez diff --git a/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java index c9b8aa35b1e..16b8637061d 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java +++ b/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -47,6 +46,8 @@ import mage.counters.CounterType; import mage.game.permanent.token.CatToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java b/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java index 3c1cd0f7775..3e56f465933 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -41,12 +40,7 @@ import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; @@ -55,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java index 42efbc6e9df..b320b17432b 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java +++ b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java index b0840dbbc88..11268235718 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java +++ b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -58,6 +57,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java index ab908ea712a..4bc712f1822 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java +++ b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java @@ -36,7 +36,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.common.FilterPlaneswalkerPermanent; import mage.filter.predicate.Predicates; @@ -46,8 +48,6 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; -import mage.constants.Zone; -import mage.filter.common.FilterControlledCreaturePermanent; /** * @author JRHerlehy diff --git a/Mage.Sets/src/mage/cards/a/AjaniValiantProtector.java b/Mage.Sets/src/mage/cards/a/AjaniValiantProtector.java index 468bbbcb2ae..343cc6bb991 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniValiantProtector.java +++ b/Mage.Sets/src/mage/cards/a/AjaniValiantProtector.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -46,6 +45,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AjaniVengeant.java b/Mage.Sets/src/mage/cards/a/AjaniVengeant.java index cd0db0d6c13..cb2674bb2b4 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniVengeant.java +++ b/Mage.Sets/src/mage/cards/a/AjaniVengeant.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.abilities.effects.Effects; @@ -44,6 +43,8 @@ import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AjanisAid.java b/Mage.Sets/src/mage/cards/a/AjanisAid.java index 28247cd3b24..44b73424848 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisAid.java +++ b/Mage.Sets/src/mage/cards/a/AjanisAid.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -43,6 +42,8 @@ import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AjanisChosen.java b/Mage.Sets/src/mage/cards/a/AjanisChosen.java index a653b7e5575..3d8b77fd6de 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisChosen.java +++ b/Mage.Sets/src/mage/cards/a/AjanisChosen.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.token.CatToken; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AjanisComrade.java b/Mage.Sets/src/mage/cards/a/AjanisComrade.java index 0734ced8c65..581196d08b2 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisComrade.java +++ b/Mage.Sets/src/mage/cards/a/AjanisComrade.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -43,6 +42,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AjanisMantra.java b/Mage.Sets/src/mage/cards/a/AjanisMantra.java index 343e23442ee..133f8a6eb35 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisMantra.java +++ b/Mage.Sets/src/mage/cards/a/AjanisMantra.java @@ -28,7 +28,6 @@ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AjanisPresence.java b/Mage.Sets/src/mage/cards/a/AjanisPresence.java index 1ef68b673d4..5b2bdc61e9a 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisPresence.java +++ b/Mage.Sets/src/mage/cards/a/AjanisPresence.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.abilityword.StriveAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AjanisPridemate.java b/Mage.Sets/src/mage/cards/a/AjanisPridemate.java index b46f43f578d..653b9ecf45b 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisPridemate.java +++ b/Mage.Sets/src/mage/cards/a/AjanisPridemate.java @@ -28,7 +28,6 @@ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AjanisSunstriker.java b/Mage.Sets/src/mage/cards/a/AjanisSunstriker.java index 39ecaaaa5e9..8569d08b680 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisSunstriker.java +++ b/Mage.Sets/src/mage/cards/a/AjanisSunstriker.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java b/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java index 13294e35484..471cc84f1b3 100644 --- a/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java +++ b/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -41,10 +40,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author spjspj @@ -60,7 +62,7 @@ public class AkiriLineSlinger extends CardImpl { public AkiriLineSlinger(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kor"); this.subtype.add("Soldier"); this.subtype.add("Ally"); diff --git a/Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java b/Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java index dad43a1bd80..4d651ca6a92 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java +++ b/Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java @@ -28,20 +28,21 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java b/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java index 34c58e89136..37895fdc630 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java +++ b/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java b/Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java index 4e3c9a1682c..44d3fcb4218 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java +++ b/Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,8 +37,14 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java b/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java index 270e0ad00ca..7a6a4ada021 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java +++ b/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java index b8dbef730d5..a2d311034b7 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java @@ -1,6 +1,5 @@ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -13,17 +12,16 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author Loki */ @@ -90,7 +88,7 @@ class AkkiLavarunnerAbility extends TriggeredAbilityImpl { class TokTokVolcanoBorn extends Token { TokTokVolcanoBorn() { super("Tok-Tok, Volcano Born", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Goblin"); diff --git a/Mage.Sets/src/mage/cards/a/AkkiRaider.java b/Mage.Sets/src/mage/cards/a/AkkiRaider.java index 0efb94fae6c..1ab5b270a64 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiRaider.java +++ b/Mage.Sets/src/mage/cards/a/AkkiRaider.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ZoneChangeAllTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java b/Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java index bb56796ac95..519cf821aad 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java +++ b/Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java @@ -27,17 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import java.util.UUID; + /** * @author Loki, North */ diff --git a/Mage.Sets/src/mage/cards/a/AkkiUnderling.java b/Mage.Sets/src/mage/cards/a/AkkiUnderling.java index 4e129a6b32e..d1effeb8f35 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiUnderling.java +++ b/Mage.Sets/src/mage/cards/a/AkkiUnderling.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkkiUnderminer.java b/Mage.Sets/src/mage/cards/a/AkkiUnderminer.java index 07f0006058a..2b9bc880bf7 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiUnderminer.java +++ b/Mage.Sets/src/mage/cards/a/AkkiUnderminer.java @@ -28,7 +28,6 @@ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java b/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java index 64807c606b6..b7f79253d2b 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java +++ b/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java @@ -27,20 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java b/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java index 6b6aee3f6fe..fb57ee8bf0b 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java +++ b/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java @@ -27,17 +27,18 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AkoumFirebird.java b/Mage.Sets/src/mage/cards/a/AkoumFirebird.java index 3e405c5a466..4c125f66b53 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumFirebird.java +++ b/Mage.Sets/src/mage/cards/a/AkoumFirebird.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AttacksEachTurnStaticAbility; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java b/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java index a09237d075e..9f32be20150 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java +++ b/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java index 26748d7c277..d0b76e4b787 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java +++ b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AkoumRefuge.java b/Mage.Sets/src/mage/cards/a/AkoumRefuge.java index 39c9d8e5199..e4150a79a6e 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumRefuge.java +++ b/Mage.Sets/src/mage/cards/a/AkoumRefuge.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +34,9 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java b/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java index 0f87c37022c..9b488d0db6b 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java +++ b/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -44,6 +43,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkrasanSquire.java b/Mage.Sets/src/mage/cards/a/AkrasanSquire.java index bbc620f50bc..de3ecf4b90e 100644 --- a/Mage.Sets/src/mage/cards/a/AkrasanSquire.java +++ b/Mage.Sets/src/mage/cards/a/AkrasanSquire.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java b/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java index 68500bf2492..bd3222c49c6 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java +++ b/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.Effect; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkroanCrusader.java b/Mage.Sets/src/mage/cards/a/AkroanCrusader.java index b55b66f2b0e..7cde81a3e3c 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanCrusader.java +++ b/Mage.Sets/src/mage/cards/a/AkroanCrusader.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.HasteAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AkroanHoplite.java b/Mage.Sets/src/mage/cards/a/AkroanHoplite.java index 7cf446aec28..0c6a699c8a0 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHoplite.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHoplite.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkroanHorse.java b/Mage.Sets/src/mage/cards/a/AkroanHorse.java index fbf19fdc1d6..1df6f76299e 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHorse.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHorse.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,13 +38,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -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.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SoldierToken; @@ -55,6 +48,8 @@ import mage.target.Target; import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkroanJailer.java b/Mage.Sets/src/mage/cards/a/AkroanJailer.java index 515b5ace1aa..1030e85222b 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanJailer.java +++ b/Mage.Sets/src/mage/cards/a/AkroanJailer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java b/Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java index d933f1f236a..367f46a9fe8 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java +++ b/Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkroanMastiff.java b/Mage.Sets/src/mage/cards/a/AkroanMastiff.java index aa07aac9e9a..b39ac72d0b5 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanMastiff.java +++ b/Mage.Sets/src/mage/cards/a/AkroanMastiff.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java b/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java index 5617896184d..e9705c4816a 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java +++ b/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkroanSergeant.java b/Mage.Sets/src/mage/cards/a/AkroanSergeant.java index 6e1f5b4e182..b1478198d93 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanSergeant.java +++ b/Mage.Sets/src/mage/cards/a/AkroanSergeant.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.RenownAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkroanSkyguard.java b/Mage.Sets/src/mage/cards/a/AkroanSkyguard.java index ee014643b33..7be07b8f238 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanSkyguard.java +++ b/Mage.Sets/src/mage/cards/a/AkroanSkyguard.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java index 096a9b8fcda..d43e1a9f7c6 100644 --- a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.CantBeCounteredAbility; @@ -42,8 +41,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +54,7 @@ public class AkromaAngelOfFury extends CardImpl { public AkromaAngelOfFury(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{R}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java index 6d808c5d692..75652af6787 100644 --- a/Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java +++ b/Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java @@ -27,13 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class AkromaAngelOfWrath extends CardImpl { public AkromaAngelOfWrath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AkromasBlessing.java b/Mage.Sets/src/mage/cards/a/AkromasBlessing.java index feb88699d98..5645b72cd56 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasBlessing.java +++ b/Mage.Sets/src/mage/cards/a/AkromasBlessing.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.GainProtectionFromColorAllEffect; import mage.abilities.keyword.CyclingAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/a/AkromasDevoted.java b/Mage.Sets/src/mage/cards/a/AkromasDevoted.java index a4e5a921073..1babd98c50a 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasDevoted.java +++ b/Mage.Sets/src/mage/cards/a/AkromasDevoted.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AkromasMemorial.java b/Mage.Sets/src/mage/cards/a/AkromasMemorial.java index d22e8a4c333..9f0e73dd795 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasMemorial.java +++ b/Mage.Sets/src/mage/cards/a/AkromasMemorial.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.CompoundAbility; import mage.abilities.common.SimpleStaticAbility; @@ -35,7 +34,9 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -48,7 +49,7 @@ public class AkromasMemorial extends CardImpl { public AkromasMemorial(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{7}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Creatures you control have flying, first strike, vigilance, trample, haste, and protection from black and from red. CompoundAbility compoundAbilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/a/AkromasVengeance.java b/Mage.Sets/src/mage/cards/a/AkromasVengeance.java index 0b34ab2ae0a..038d3830e89 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasVengeance.java +++ b/Mage.Sets/src/mage/cards/a/AkromasVengeance.java @@ -27,18 +27,18 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.abilities.effects.common.DestroyAllEffect; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java index 9358308d6c3..a1d2647f019 100644 --- a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java +++ b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java b/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java index 1445f8940da..a7089fa86a4 100644 --- a/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java +++ b/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,12 +39,15 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +61,7 @@ public class AkutaBornOfAsh extends CardImpl { public AkutaBornOfAsh(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterDragon.java b/Mage.Sets/src/mage/cards/a/AlabasterDragon.java index 56b2a3d5e27..35803861f8c 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterDragon.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlabasterKirin.java b/Mage.Sets/src/mage/cards/a/AlabasterKirin.java index 58a9bb572a2..55c58bd15d4 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterKirin.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterKirin.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AlabasterLeech.java b/Mage.Sets/src/mage/cards/a/AlabasterLeech.java index 1073a2078f7..149cb056999 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterLeech.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterLeech.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlabasterMage.java b/Mage.Sets/src/mage/cards/a/AlabasterMage.java index 8365528fae5..60dd7457582 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterMage.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterMage.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,10 +36,13 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AlabasterWall.java b/Mage.Sets/src/mage/cards/a/AlabasterWall.java index c6c39231774..eb86cc4e8c0 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterWall.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterWall.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlabornCavalier.java b/Mage.Sets/src/mage/cards/a/AlabornCavalier.java index 36118289595..fb25b0e1723 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornCavalier.java +++ b/Mage.Sets/src/mage/cards/a/AlabornCavalier.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/a/AlabornGrenadier.java b/Mage.Sets/src/mage/cards/a/AlabornGrenadier.java index 084bd90e422..56c0b24267d 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornGrenadier.java +++ b/Mage.Sets/src/mage/cards/a/AlabornGrenadier.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AlabornMusketeer.java b/Mage.Sets/src/mage/cards/a/AlabornMusketeer.java index 18860cd99f4..31e513c7c34 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornMusketeer.java +++ b/Mage.Sets/src/mage/cards/a/AlabornMusketeer.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AlabornTrooper.java b/Mage.Sets/src/mage/cards/a/AlabornTrooper.java index ffc39ef9686..d2f7e2860a6 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornTrooper.java +++ b/Mage.Sets/src/mage/cards/a/AlabornTrooper.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AlabornVeteran.java b/Mage.Sets/src/mage/cards/a/AlabornVeteran.java index 83b18e6ae79..0f384d7983a 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornVeteran.java +++ b/Mage.Sets/src/mage/cards/a/AlabornVeteran.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Aladdin.java b/Mage.Sets/src/mage/cards/a/Aladdin.java index e95ccf42e4f..9021c58183b 100644 --- a/Mage.Sets/src/mage/cards/a/Aladdin.java +++ b/Mage.Sets/src/mage/cards/a/Aladdin.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/a/AladdinsLamp.java b/Mage.Sets/src/mage/cards/a/AladdinsLamp.java index 608529408cf..248b02cd454 100644 --- a/Mage.Sets/src/mage/cards/a/AladdinsLamp.java +++ b/Mage.Sets/src/mage/cards/a/AladdinsLamp.java @@ -27,17 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ReplacementEffectImpl; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -48,6 +43,8 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/a/AladdinsRing.java b/Mage.Sets/src/mage/cards/a/AladdinsRing.java index 765c88d17c1..cd87e2104c8 100644 --- a/Mage.Sets/src/mage/cards/a/AladdinsRing.java +++ b/Mage.Sets/src/mage/cards/a/AladdinsRing.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,9 +34,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/Alarum.java b/Mage.Sets/src/mage/cards/a/Alarum.java index 650ef193a84..74cecb57186 100644 --- a/Mage.Sets/src/mage/cards/a/Alarum.java +++ b/Mage.Sets/src/mage/cards/a/Alarum.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlbinoTroll.java b/Mage.Sets/src/mage/cards/a/AlbinoTroll.java index 78676beb488..9f092a3278f 100644 --- a/Mage.Sets/src/mage/cards/a/AlbinoTroll.java +++ b/Mage.Sets/src/mage/cards/a/AlbinoTroll.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +35,10 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java b/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java index f1a70190200..41988c0a3c7 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java @@ -27,13 +27,13 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java b/Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java index 0135f9e6bbb..8bf60a495c1 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.MadnessAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java b/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java index a9d1d402846..7962e6a1e04 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.CompositeCost; import mage.abilities.costs.common.TapSourceCost; @@ -44,6 +43,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsVial.java b/Mage.Sets/src/mage/cards/a/AlchemistsVial.java index 0610f7ceb99..196ca984cc0 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsVial.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsVial.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlchorsTomb.java b/Mage.Sets/src/mage/cards/a/AlchorsTomb.java index 21990d82360..5f07f1b1162 100644 --- a/Mage.Sets/src/mage/cards/a/AlchorsTomb.java +++ b/Mage.Sets/src/mage/cards/a/AlchorsTomb.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Aleatory.java b/Mage.Sets/src/mage/cards/a/Aleatory.java index 6caeeea06da..11f35631a13 100644 --- a/Mage.Sets/src/mage/cards/a/Aleatory.java +++ b/Mage.Sets/src/mage/cards/a/Aleatory.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AlertShuInfantry.java b/Mage.Sets/src/mage/cards/a/AlertShuInfantry.java index e8f5d0fe624..1dd8acd3d42 100644 --- a/Mage.Sets/src/mage/cards/a/AlertShuInfantry.java +++ b/Mage.Sets/src/mage/cards/a/AlertShuInfantry.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AleshaWhoSmilesAtDeath.java b/Mage.Sets/src/mage/cards/a/AleshaWhoSmilesAtDeath.java index 168844eca7a..ddf512b2e42 100644 --- a/Mage.Sets/src/mage/cards/a/AleshaWhoSmilesAtDeath.java +++ b/Mage.Sets/src/mage/cards/a/AleshaWhoSmilesAtDeath.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreatureCard; @@ -48,6 +48,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +64,7 @@ public class AleshaWhoSmilesAtDeath extends CardImpl { public AleshaWhoSmilesAtDeath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AleshasVanguard.java b/Mage.Sets/src/mage/cards/a/AleshasVanguard.java index 5fb3c7d1cb4..b6f776dd74c 100644 --- a/Mage.Sets/src/mage/cards/a/AleshasVanguard.java +++ b/Mage.Sets/src/mage/cards/a/AleshasVanguard.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java b/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java index f70a3295266..c5d9ca90e4b 100644 --- a/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java +++ b/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; @@ -46,6 +46,8 @@ import mage.game.Game; import mage.target.TargetPermanent; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) @@ -62,7 +64,7 @@ public class AlexiZephyrMage extends CardImpl { public AlexiZephyrMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Spellshaper"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AlexisCloak.java b/Mage.Sets/src/mage/cards/a/AlexisCloak.java index 9808fc0c5a1..332d872f39f 100644 --- a/Mage.Sets/src/mage/cards/a/AlexisCloak.java +++ b/Mage.Sets/src/mage/cards/a/AlexisCloak.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlgaeGharial.java b/Mage.Sets/src/mage/cards/a/AlgaeGharial.java index d890478414a..5e28ae851e9 100644 --- a/Mage.Sets/src/mage/cards/a/AlgaeGharial.java +++ b/Mage.Sets/src/mage/cards/a/AlgaeGharial.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java index 1fdf190b7ba..eae24180270 100644 --- a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -37,15 +35,8 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.common.FilterNonlandCard; import mage.game.Game; import mage.game.events.GameEvent; @@ -56,6 +47,9 @@ import mage.target.TargetCard; import mage.util.CardUtil; import mage.util.GameLog; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +58,7 @@ public class AlhammarretHighArbiter extends CardImpl { public AlhammarretHighArbiter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Sphinx"); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java b/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java index 2c80e8e6251..668a943e9c4 100644 --- a/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java +++ b/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java @@ -27,22 +27,19 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.common.CardsDrawnDuringDrawStepWatcher; +import java.util.UUID; + /** * * @author fireshoes @@ -51,7 +48,7 @@ public class AlhammarretsArchive extends CardImpl { public AlhammarretsArchive(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // If you would gain life, you gain twice that much life instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveEffect())); diff --git a/Mage.Sets/src/mage/cards/a/AliBaba.java b/Mage.Sets/src/mage/cards/a/AliBaba.java index 16895d423d3..a1f83576b51 100644 --- a/Mage.Sets/src/mage/cards/a/AliBaba.java +++ b/Mage.Sets/src/mage/cards/a/AliBaba.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AliFromCairo.java b/Mage.Sets/src/mage/cards/a/AliFromCairo.java index 7f560791b55..e58ea12904b 100644 --- a/Mage.Sets/src/mage/cards/a/AliFromCairo.java +++ b/Mage.Sets/src/mage/cards/a/AliFromCairo.java @@ -27,19 +27,23 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/a/AlibansTower.java b/Mage.Sets/src/mage/cards/a/AlibansTower.java index ce93cdf349a..90212e6af68 100644 --- a/Mage.Sets/src/mage/cards/a/AlibansTower.java +++ b/Mage.Sets/src/mage/cards/a/AlibansTower.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.constants.Duration; import mage.filter.common.FilterBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlignedHedronNetwork.java b/Mage.Sets/src/mage/cards/a/AlignedHedronNetwork.java index 5143a6be5fc..8a577a568e9 100644 --- a/Mage.Sets/src/mage/cards/a/AlignedHedronNetwork.java +++ b/Mage.Sets/src/mage/cards/a/AlignedHedronNetwork.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility; @@ -48,6 +45,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.CardUtil; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AliveWell.java b/Mage.Sets/src/mage/cards/a/AliveWell.java index a6eed04a19c..5a68720e036 100644 --- a/Mage.Sets/src/mage/cards/a/AliveWell.java +++ b/Mage.Sets/src/mage/cards/a/AliveWell.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.token.CentaurToken; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AllHallowsEve.java b/Mage.Sets/src/mage/cards/a/AllHallowsEve.java index a9f7270a0d1..dec9c437a37 100644 --- a/Mage.Sets/src/mage/cards/a/AllHallowsEve.java +++ b/Mage.Sets/src/mage/cards/a/AllHallowsEve.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; @@ -35,11 +34,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -49,6 +44,8 @@ import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AllIsDust.java b/Mage.Sets/src/mage/cards/a/AllIsDust.java index 9937fa311c7..e456796abfd 100644 --- a/Mage.Sets/src/mage/cards/a/AllIsDust.java +++ b/Mage.Sets/src/mage/cards/a/AllIsDust.java @@ -27,18 +27,18 @@ */ package mage.cards.a; -import java.util.List; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.List; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AllSunsDawn.java b/Mage.Sets/src/mage/cards/a/AllSunsDawn.java index 1cb06ac2c1b..24568efab48 100644 --- a/Mage.Sets/src/mage/cards/a/AllSunsDawn.java +++ b/Mage.Sets/src/mage/cards/a/AllSunsDawn.java @@ -27,16 +27,11 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -47,6 +42,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Allay.java b/Mage.Sets/src/mage/cards/a/Allay.java index 84d4b3dcc9c..5fae1b86ca2 100644 --- a/Mage.Sets/src/mage/cards/a/Allay.java +++ b/Mage.Sets/src/mage/cards/a/Allay.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AlleyEvasion.java b/Mage.Sets/src/mage/cards/a/AlleyEvasion.java index 139bba8e53f..51122f7d0b9 100644 --- a/Mage.Sets/src/mage/cards/a/AlleyEvasion.java +++ b/Mage.Sets/src/mage/cards/a/AlleyEvasion.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AlleyGrifters.java b/Mage.Sets/src/mage/cards/a/AlleyGrifters.java index 76a5e733472..cace05e799d 100644 --- a/Mage.Sets/src/mage/cards/a/AlleyGrifters.java +++ b/Mage.Sets/src/mage/cards/a/AlleyGrifters.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AlleyStrangler.java b/Mage.Sets/src/mage/cards/a/AlleyStrangler.java index ffcf8b5cbfc..fcc6105d1b3 100644 --- a/Mage.Sets/src/mage/cards/a/AlleyStrangler.java +++ b/Mage.Sets/src/mage/cards/a/AlleyStrangler.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AllianceOfArms.java b/Mage.Sets/src/mage/cards/a/AllianceOfArms.java index 3263ea37668..fd6f4ada109 100644 --- a/Mage.Sets/src/mage/cards/a/AllianceOfArms.java +++ b/Mage.Sets/src/mage/cards/a/AllianceOfArms.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; @@ -44,6 +42,9 @@ import mage.game.permanent.token.SoldierToken; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AlliedReinforcements.java b/Mage.Sets/src/mage/cards/a/AlliedReinforcements.java index 88b19b0aabd..721b99c158f 100644 --- a/Mage.Sets/src/mage/cards/a/AlliedReinforcements.java +++ b/Mage.Sets/src/mage/cards/a/AlliedReinforcements.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AlliedStrategies.java b/Mage.Sets/src/mage/cards/a/AlliedStrategies.java index 7d1009bad95..b0e00ea62de 100644 --- a/Mage.Sets/src/mage/cards/a/AlliedStrategies.java +++ b/Mage.Sets/src/mage/cards/a/AlliedStrategies.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/a/AllosaurusRider.java b/Mage.Sets/src/mage/cards/a/AllosaurusRider.java index a80ad4a3202..2d417bce3e5 100644 --- a/Mage.Sets/src/mage/cards/a/AllosaurusRider.java +++ b/Mage.Sets/src/mage/cards/a/AllosaurusRider.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AlloyGolem.java b/Mage.Sets/src/mage/cards/a/AlloyGolem.java index 2f2ec6e3d62..cdf90fad7a5 100644 --- a/Mage.Sets/src/mage/cards/a/AlloyGolem.java +++ b/Mage.Sets/src/mage/cards/a/AlloyGolem.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.continuous.BecomesColorSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlloyMyr.java b/Mage.Sets/src/mage/cards/a/AlloyMyr.java index 12bf244ba9a..8814502a493 100644 --- a/Mage.Sets/src/mage/cards/a/AlloyMyr.java +++ b/Mage.Sets/src/mage/cards/a/AlloyMyr.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AlluringScent.java b/Mage.Sets/src/mage/cards/a/AlluringScent.java index 2beb557da29..e8845025cb2 100644 --- a/Mage.Sets/src/mage/cards/a/AlluringScent.java +++ b/Mage.Sets/src/mage/cards/a/AlluringScent.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.combat.MustBeBlockedByAllTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/a/AlluringSiren.java b/Mage.Sets/src/mage/cards/a/AlluringSiren.java index a6390d4ac03..b8c3bf9b14e 100644 --- a/Mage.Sets/src/mage/cards/a/AlluringSiren.java +++ b/Mage.Sets/src/mage/cards/a/AlluringSiren.java @@ -28,11 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +35,16 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.combat.AttacksIfAbleTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AllyEncampment.java b/Mage.Sets/src/mage/cards/a/AllyEncampment.java index 2a09ddcbe2d..2b6d2567892 100644 --- a/Mage.Sets/src/mage/cards/a/AllyEncampment.java +++ b/Mage.Sets/src/mage/cards/a/AllyEncampment.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Alms.java b/Mage.Sets/src/mage/cards/a/Alms.java index 05c35d804cd..1d2e692d8f3 100644 --- a/Mage.Sets/src/mage/cards/a/Alms.java +++ b/Mage.Sets/src/mage/cards/a/Alms.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileTopCardOfGraveyardCost; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AlmsBeast.java b/Mage.Sets/src/mage/cards/a/AlmsBeast.java index 06a6cfa1667..dc667a562c7 100644 --- a/Mage.Sets/src/mage/cards/a/AlmsBeast.java +++ b/Mage.Sets/src/mage/cards/a/AlmsBeast.java @@ -27,21 +27,22 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.BlockedByIdPredicate; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java b/Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java index 5384e7c83de..f69df845dbd 100644 --- a/Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java +++ b/Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.GainLifeEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java index eb011deb6a4..82db9980b4a 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java +++ b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -38,19 +37,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AlphaBrawl.java b/Mage.Sets/src/mage/cards/a/AlphaBrawl.java index 5a349fbccad..ec02398b0e8 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaBrawl.java +++ b/Mage.Sets/src/mage/cards/a/AlphaBrawl.java @@ -27,11 +27,11 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/AlphaKavu.java b/Mage.Sets/src/mage/cards/a/AlphaKavu.java index 3edb61d52bf..d039a685290 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaKavu.java +++ b/Mage.Sets/src/mage/cards/a/AlphaKavu.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AlphaMyr.java b/Mage.Sets/src/mage/cards/a/AlphaMyr.java index bb07a7513b4..86d9aa080f9 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaMyr.java +++ b/Mage.Sets/src/mage/cards/a/AlphaMyr.java @@ -27,11 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AlphaStatus.java b/Mage.Sets/src/mage/cards/a/AlphaStatus.java index 40e1b2c1513..695df00850f 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaStatus.java +++ b/Mage.Sets/src/mage/cards/a/AlphaStatus.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -48,6 +47,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Eirkei diff --git a/Mage.Sets/src/mage/cards/a/AlphaTyrranax.java b/Mage.Sets/src/mage/cards/a/AlphaTyrranax.java index b67bcc35ee5..d0dbc294de0 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaTyrranax.java +++ b/Mage.Sets/src/mage/cards/a/AlphaTyrranax.java @@ -28,10 +28,10 @@ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AlpineGrizzly.java b/Mage.Sets/src/mage/cards/a/AlpineGrizzly.java index b1a6fcef2a8..59ac904f089 100644 --- a/Mage.Sets/src/mage/cards/a/AlpineGrizzly.java +++ b/Mage.Sets/src/mage/cards/a/AlpineGrizzly.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java b/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java index 51b9eb011ad..a64e1cc5d88 100644 --- a/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java +++ b/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AltarGolem.java b/Mage.Sets/src/mage/cards/a/AltarGolem.java index 3e606969024..615be6a9532 100644 --- a/Mage.Sets/src/mage/cards/a/AltarGolem.java +++ b/Mage.Sets/src/mage/cards/a/AltarGolem.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -49,6 +48,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AltarOfBone.java b/Mage.Sets/src/mage/cards/a/AltarOfBone.java index 92fed197605..3b2b6b8f2f2 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfBone.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfBone.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AltarOfDementia.java b/Mage.Sets/src/mage/cards/a/AltarOfDementia.java index a4467f071e6..c3f12e3857c 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfDementia.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfDementia.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -37,6 +34,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; @@ -46,6 +44,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AltarOfShadows.java b/Mage.Sets/src/mage/cards/a/AltarOfShadows.java index 75f44ab407d..b4cc44ce6fc 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfShadows.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfShadows.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.BeginningOfPreCombatMainTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java b/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java index 4a517c27df9..0e42f3b6d34 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveEachPlayerEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AltarOfTheLost.java b/Mage.Sets/src/mage/cards/a/AltarOfTheLost.java index 52dcd8fa559..285f1b64c7c 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfTheLost.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfTheLost.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ConditionalMana; import mage.MageObject; import mage.Mana; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/a/AltarsLight.java b/Mage.Sets/src/mage/cards/a/AltarsLight.java index fa57addaf61..e4cb45bbd80 100644 --- a/Mage.Sets/src/mage/cards/a/AltarsLight.java +++ b/Mage.Sets/src/mage/cards/a/AltarsLight.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AltarsReap.java b/Mage.Sets/src/mage/cards/a/AltarsReap.java index 35c9c964709..2b44a7c1074 100644 --- a/Mage.Sets/src/mage/cards/a/AltarsReap.java +++ b/Mage.Sets/src/mage/cards/a/AltarsReap.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AlteredEgo.java b/Mage.Sets/src/mage/cards/a/AlteredEgo.java index 427988e3b7d..5b47f126a83 100644 --- a/Mage.Sets/src/mage/cards/a/AlteredEgo.java +++ b/Mage.Sets/src/mage/cards/a/AlteredEgo.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Aluren.java b/Mage.Sets/src/mage/cards/a/Aluren.java index 68730e3ed55..ac887d25e13 100644 --- a/Mage.Sets/src/mage/cards/a/Aluren.java +++ b/Mage.Sets/src/mage/cards/a/Aluren.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceIsSpellCondition; @@ -37,18 +36,15 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.CastAsThoughItHadFlashAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * 10/4/2004 The mana cost of the creatures being cast is still the stated cost on the card, * even though you did not pay the cost. diff --git a/Mage.Sets/src/mage/cards/a/AlwaysWatching.java b/Mage.Sets/src/mage/cards/a/AlwaysWatching.java index 419e1c8d85a..ddc90eecc66 100644 --- a/Mage.Sets/src/mage/cards/a/AlwaysWatching.java +++ b/Mage.Sets/src/mage/cards/a/AlwaysWatching.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AmassTheComponents.java b/Mage.Sets/src/mage/cards/a/AmassTheComponents.java index 48944049f86..a52a01b8f65 100644 --- a/Mage.Sets/src/mage/cards/a/AmassTheComponents.java +++ b/Mage.Sets/src/mage/cards/a/AmassTheComponents.java @@ -27,20 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java b/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java index 4716bc72997..8930983a452 100644 --- a/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java +++ b/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +34,13 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki @@ -48,7 +49,7 @@ public class AmbassadorLaquatus extends CardImpl { public AmbassadorLaquatus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/a/AmbassadorOak.java b/Mage.Sets/src/mage/cards/a/AmbassadorOak.java index 71bd45bb08c..85a453e1d00 100644 --- a/Mage.Sets/src/mage/cards/a/AmbassadorOak.java +++ b/Mage.Sets/src/mage/cards/a/AmbassadorOak.java @@ -27,16 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.ElfToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AmberPrison.java b/Mage.Sets/src/mage/cards/a/AmberPrison.java index bb3f0c36dd4..a88eec9950e 100644 --- a/Mage.Sets/src/mage/cards/a/AmberPrison.java +++ b/Mage.Sets/src/mage/cards/a/AmberPrison.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SkipUntapOptionalAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AmbitionsCost.java b/Mage.Sets/src/mage/cards/a/AmbitionsCost.java index c5117fbd584..01df6fc8e3e 100644 --- a/Mage.Sets/src/mage/cards/a/AmbitionsCost.java +++ b/Mage.Sets/src/mage/cards/a/AmbitionsCost.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AmbitiousAetherborn.java b/Mage.Sets/src/mage/cards/a/AmbitiousAetherborn.java index 77421d719e2..522c09014f1 100644 --- a/Mage.Sets/src/mage/cards/a/AmbitiousAetherborn.java +++ b/Mage.Sets/src/mage/cards/a/AmbitiousAetherborn.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FabricateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java b/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java index cfa80d4e857..c07289236a5 100644 --- a/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java +++ b/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Ambush.java b/Mage.Sets/src/mage/cards/a/Ambush.java index 447a167d156..78eb28efb95 100644 --- a/Mage.Sets/src/mage/cards/a/Ambush.java +++ b/Mage.Sets/src/mage/cards/a/Ambush.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterBlockingCreature; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index b96721776a4..da00e062d6e 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -50,6 +49,8 @@ import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java b/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java index 7fdcb4f783d..b2e835835e6 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java +++ b/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AmbushParty.java b/Mage.Sets/src/mage/cards/a/AmbushParty.java index 83ebe0b1b15..41fde1137be 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushParty.java +++ b/Mage.Sets/src/mage/cards/a/AmbushParty.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AmbushViper.java b/Mage.Sets/src/mage/cards/a/AmbushViper.java index e22a821d200..4423e962639 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushViper.java +++ b/Mage.Sets/src/mage/cards/a/AmbushViper.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.DeathtouchAbility; +import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/Amnesia.java b/Mage.Sets/src/mage/cards/a/Amnesia.java index 70e53153fde..88f68c5de7d 100644 --- a/Mage.Sets/src/mage/cards/a/Amnesia.java +++ b/Mage.Sets/src/mage/cards/a/Amnesia.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -41,6 +39,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.Set; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java b/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java index 5548892b53c..a8d75ee5be4 100644 --- a/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java +++ b/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,13 +36,11 @@ import mage.abilities.effects.common.continuous.LoseAllCreatureTypesTargetEffect import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author EvilGeek diff --git a/Mage.Sets/src/mage/cards/a/Amok.java b/Mage.Sets/src/mage/cards/a/Amok.java index 3c94c5b26ea..cd37cabc291 100644 --- a/Mage.Sets/src/mage/cards/a/Amok.java +++ b/Mage.Sets/src/mage/cards/a/Amok.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AmphinCutthroat.java b/Mage.Sets/src/mage/cards/a/AmphinCutthroat.java index f54c818a4c1..feea63dd51a 100644 --- a/Mage.Sets/src/mage/cards/a/AmphinCutthroat.java +++ b/Mage.Sets/src/mage/cards/a/AmphinCutthroat.java @@ -27,11 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AmphinPathmage.java b/Mage.Sets/src/mage/cards/a/AmphinPathmage.java index 25fb0d658c7..63662aa26b2 100644 --- a/Mage.Sets/src/mage/cards/a/AmphinPathmage.java +++ b/Mage.Sets/src/mage/cards/a/AmphinPathmage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AmprynTactician.java b/Mage.Sets/src/mage/cards/a/AmprynTactician.java index 3cb54bde981..b0be9ef3550 100644 --- a/Mage.Sets/src/mage/cards/a/AmprynTactician.java +++ b/Mage.Sets/src/mage/cards/a/AmprynTactician.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/a/AmrouKithkin.java b/Mage.Sets/src/mage/cards/a/AmrouKithkin.java index 0e53d4000a8..809c7fa63b1 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouKithkin.java +++ b/Mage.Sets/src/mage/cards/a/AmrouKithkin.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -39,6 +38,8 @@ import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AmrouScout.java b/Mage.Sets/src/mage/cards/a/AmrouScout.java index 2200427f196..91721f01177 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouScout.java +++ b/Mage.Sets/src/mage/cards/a/AmrouScout.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,6 +34,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterPermanentCard; @@ -44,6 +42,8 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AmrouSeekers.java b/Mage.Sets/src/mage/cards/a/AmrouSeekers.java index aef06c66383..ccc0782c064 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouSeekers.java +++ b/Mage.Sets/src/mage/cards/a/AmrouSeekers.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleEvasionAbility; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Amugaba.java b/Mage.Sets/src/mage/cards/a/Amugaba.java index ebd74690c83..7a4b135b848 100644 --- a/Mage.Sets/src/mage/cards/a/Amugaba.java +++ b/Mage.Sets/src/mage/cards/a/Amugaba.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java b/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java index 2fa01e72415..d60c23e709d 100644 --- a/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java +++ b/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java @@ -27,19 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.abilities.costs.mana.GenericManaCost; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/a/AmuletOfVigor.java b/Mage.Sets/src/mage/cards/a/AmuletOfVigor.java index 51cab4b2908..c4cf186d561 100644 --- a/Mage.Sets/src/mage/cards/a/AmuletOfVigor.java +++ b/Mage.Sets/src/mage/cards/a/AmuletOfVigor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java b/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java index cc5122977b5..7b4f6151f0f 100644 --- a/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java +++ b/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -36,17 +35,14 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AnHavvaInn.java b/Mage.Sets/src/mage/cards/a/AnHavvaInn.java index 5e957975c2f..d2ef47929d3 100644 --- a/Mage.Sets/src/mage/cards/a/AnHavvaInn.java +++ b/Mage.Sets/src/mage/cards/a/AnHavvaInn.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AnHavvaTownship.java b/Mage.Sets/src/mage/cards/a/AnHavvaTownship.java index 8257f30751f..bf2a1d30ce8 100644 --- a/Mage.Sets/src/mage/cards/a/AnHavvaTownship.java +++ b/Mage.Sets/src/mage/cards/a/AnHavvaTownship.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java index 01474e8388e..1052a275103 100644 --- a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java +++ b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -50,6 +49,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AnaDisciple.java b/Mage.Sets/src/mage/cards/a/AnaDisciple.java index e4088706114..3d6fb5b268e 100644 --- a/Mage.Sets/src/mage/cards/a/AnaDisciple.java +++ b/Mage.Sets/src/mage/cards/a/AnaDisciple.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,8 +38,14 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java index 22f60075165..a7a1fc39739 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AnabaBodyguard.java b/Mage.Sets/src/mage/cards/a/AnabaBodyguard.java index 30686348e9e..fb78c171057 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaBodyguard.java +++ b/Mage.Sets/src/mage/cards/a/AnabaBodyguard.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AnabaShaman.java b/Mage.Sets/src/mage/cards/a/AnabaShaman.java index b33182e4f3e..bcf05c418e4 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaShaman.java +++ b/Mage.Sets/src/mage/cards/a/AnabaShaman.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java index dafdf960d8c..5840ddbd16b 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java +++ b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/Anaconda.java b/Mage.Sets/src/mage/cards/a/Anaconda.java index 3b009ab6f6f..e9dfd099490 100644 --- a/Mage.Sets/src/mage/cards/a/Anaconda.java +++ b/Mage.Sets/src/mage/cards/a/Anaconda.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java index b8b9bddeb42..8e1f85e5127 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java @@ -27,19 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.keyword.BolsterEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -55,7 +57,7 @@ public class AnafenzaKinTreeSpirit extends CardImpl { public AnafenzaKinTreeSpirit(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java index 8a508658420..8af34fb2443 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -37,10 +36,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -52,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -67,7 +65,7 @@ public class AnafenzaTheForemost extends CardImpl { public AnafenzaTheForemost(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java b/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java index c8719c61c8c..955aa645bf8 100644 --- a/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java +++ b/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -39,13 +38,10 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.d.DarthVader; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.d.DarthVader; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -56,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -70,7 +68,7 @@ public class AnakinSkywalker extends CardImpl { public AnakinSkywalker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Sith"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/Anarchist.java b/Mage.Sets/src/mage/cards/a/Anarchist.java index d5dc791811d..e6c79933222 100644 --- a/Mage.Sets/src/mage/cards/a/Anarchist.java +++ b/Mage.Sets/src/mage/cards/a/Anarchist.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Anarchy.java b/Mage.Sets/src/mage/cards/a/Anarchy.java index ce5418c8d70..735a47b806d 100644 --- a/Mage.Sets/src/mage/cards/a/Anarchy.java +++ b/Mage.Sets/src/mage/cards/a/Anarchy.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Anavolver.java b/Mage.Sets/src/mage/cards/a/Anavolver.java index af12d667822..6d830c6d479 100644 --- a/Mage.Sets/src/mage/cards/a/Anavolver.java +++ b/Mage.Sets/src/mage/cards/a/Anavolver.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -45,8 +41,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AnaxAndCymede.java b/Mage.Sets/src/mage/cards/a/AnaxAndCymede.java index e06d422453c..57ca70914d0 100644 --- a/Mage.Sets/src/mage/cards/a/AnaxAndCymede.java +++ b/Mage.Sets/src/mage/cards/a/AnaxAndCymede.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.Effect; @@ -41,8 +40,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class AnaxAndCymede extends CardImpl { public AnaxAndCymede(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/a/AncestorsChosen.java b/Mage.Sets/src/mage/cards/a/AncestorsChosen.java index 85a109f5fca..e84ef24c418 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsChosen.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsChosen.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; @@ -36,6 +34,9 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java index 9be7d57a005..dce451a6e0d 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/a/AncestralKnowledge.java b/Mage.Sets/src/mage/cards/a/AncestralKnowledge.java index 4d35a521c27..0025c3a0c9f 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralKnowledge.java +++ b/Mage.Sets/src/mage/cards/a/AncestralKnowledge.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; @@ -35,11 +34,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ShuffleLibrarySourceEffect; import mage.abilities.keyword.CumulativeUpkeepAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -48,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AncestralMask.java b/Mage.Sets/src/mage/cards/a/AncestralMask.java index 9bd3ce1dab1..b03b8a674f7 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMask.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMask.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AncestralMemories.java b/Mage.Sets/src/mage/cards/a/AncestralMemories.java index 5041fb9b37c..443b02c77d7 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMemories.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMemories.java @@ -27,15 +27,9 @@ */ package mage.cards.a; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -44,6 +38,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.List; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AncestralRecall.java b/Mage.Sets/src/mage/cards/a/AncestralRecall.java index cdaeecd516d..89a43a94916 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralRecall.java +++ b/Mage.Sets/src/mage/cards/a/AncestralRecall.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AncestralStatue.java b/Mage.Sets/src/mage/cards/a/AncestralStatue.java index 8432f9a71f5..d0baef62de4 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralStatue.java +++ b/Mage.Sets/src/mage/cards/a/AncestralStatue.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; @@ -38,6 +37,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AncestralTribute.java b/Mage.Sets/src/mage/cards/a/AncestralTribute.java index 5510bac7b98..c4c8feda14b 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralTribute.java +++ b/Mage.Sets/src/mage/cards/a/AncestralTribute.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.GainLifeEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.filter.FilterCard; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java index 9b37cb8bf28..9ed2d3962e4 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java +++ b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AncestralVision.java b/Mage.Sets/src/mage/cards/a/AncestralVision.java index fd5902fd5c7..8ef8891a138 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralVision.java +++ b/Mage.Sets/src/mage/cards/a/AncestralVision.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.keyword.SuspendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AnchorToTheAether.java b/Mage.Sets/src/mage/cards/a/AnchorToTheAether.java index 2c8acf4779e..6284cf00ec3 100644 --- a/Mage.Sets/src/mage/cards/a/AnchorToTheAether.java +++ b/Mage.Sets/src/mage/cards/a/AnchorToTheAether.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AncientAmphitheater.java b/Mage.Sets/src/mage/cards/a/AncientAmphitheater.java index ff683a6a7ff..1497719a095 100644 --- a/Mage.Sets/src/mage/cards/a/AncientAmphitheater.java +++ b/Mage.Sets/src/mage/cards/a/AncientAmphitheater.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -36,10 +34,13 @@ import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AncientCarp.java b/Mage.Sets/src/mage/cards/a/AncientCarp.java index d91de3ccaeb..0f571249f65 100644 --- a/Mage.Sets/src/mage/cards/a/AncientCarp.java +++ b/Mage.Sets/src/mage/cards/a/AncientCarp.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AncientCrab.java b/Mage.Sets/src/mage/cards/a/AncientCrab.java index 4becc52b0b6..232bda2aabf 100644 --- a/Mage.Sets/src/mage/cards/a/AncientCrab.java +++ b/Mage.Sets/src/mage/cards/a/AncientCrab.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AncientCraving.java b/Mage.Sets/src/mage/cards/a/AncientCraving.java index 8a9d54287bf..32168269d42 100644 --- a/Mage.Sets/src/mage/cards/a/AncientCraving.java +++ b/Mage.Sets/src/mage/cards/a/AncientCraving.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/a/AncientDen.java b/Mage.Sets/src/mage/cards/a/AncientDen.java index 36517bc2db2..087dbbe1350 100644 --- a/Mage.Sets/src/mage/cards/a/AncientDen.java +++ b/Mage.Sets/src/mage/cards/a/AncientDen.java @@ -28,11 +28,12 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AncientExcavation.java b/Mage.Sets/src/mage/cards/a/AncientExcavation.java index 9832cb14cb5..c9ffa8c8dde 100644 --- a/Mage.Sets/src/mage/cards/a/AncientExcavation.java +++ b/Mage.Sets/src/mage/cards/a/AncientExcavation.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.DynamicValue; @@ -41,6 +40,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/a/AncientGrudge.java b/Mage.Sets/src/mage/cards/a/AncientGrudge.java index 9068dfe957a..2bce3d5c0af 100644 --- a/Mage.Sets/src/mage/cards/a/AncientGrudge.java +++ b/Mage.Sets/src/mage/cards/a/AncientGrudge.java @@ -27,12 +27,12 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetArtifactPermanent; diff --git a/Mage.Sets/src/mage/cards/a/AncientHellkite.java b/Mage.Sets/src/mage/cards/a/AncientHellkite.java index ad14ae3eb78..c19414f28a1 100644 --- a/Mage.Sets/src/mage/cards/a/AncientHellkite.java +++ b/Mage.Sets/src/mage/cards/a/AncientHellkite.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; @@ -42,12 +38,17 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AncientHolocron.java b/Mage.Sets/src/mage/cards/a/AncientHolocron.java index cc7a259b6b3..8a90226dbfd 100644 --- a/Mage.Sets/src/mage/cards/a/AncientHolocron.java +++ b/Mage.Sets/src/mage/cards/a/AncientHolocron.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.mana.ConditionalAnyColorManaAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AncientHydra.java b/Mage.Sets/src/mage/cards/a/AncientHydra.java index a8c1a631fc9..b0a2bb759f9 100644 --- a/Mage.Sets/src/mage/cards/a/AncientHydra.java +++ b/Mage.Sets/src/mage/cards/a/AncientHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AncientKavu.java b/Mage.Sets/src/mage/cards/a/AncientKavu.java index 80d3e304047..7b4bd19e6bd 100644 --- a/Mage.Sets/src/mage/cards/a/AncientKavu.java +++ b/Mage.Sets/src/mage/cards/a/AncientKavu.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AncientOfTheEquinox.java b/Mage.Sets/src/mage/cards/a/AncientOfTheEquinox.java index 40a98196583..09e3e695ff3 100644 --- a/Mage.Sets/src/mage/cards/a/AncientOfTheEquinox.java +++ b/Mage.Sets/src/mage/cards/a/AncientOfTheEquinox.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.abilities.keyword.TrampleAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AncientRunes.java b/Mage.Sets/src/mage/cards/a/AncientRunes.java index 7ae003fdd6b..f15e88391b9 100644 --- a/Mage.Sets/src/mage/cards/a/AncientRunes.java +++ b/Mage.Sets/src/mage/cards/a/AncientRunes.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledArtifactPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AncientSilverback.java b/Mage.Sets/src/mage/cards/a/AncientSilverback.java index aa469c7eaa8..bad154d04c3 100644 --- a/Mage.Sets/src/mage/cards/a/AncientSilverback.java +++ b/Mage.Sets/src/mage/cards/a/AncientSilverback.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AncientSpider.java b/Mage.Sets/src/mage/cards/a/AncientSpider.java index 042c5466c91..6d5c7040555 100644 --- a/Mage.Sets/src/mage/cards/a/AncientSpider.java +++ b/Mage.Sets/src/mage/cards/a/AncientSpider.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ReachAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AncientSpring.java b/Mage.Sets/src/mage/cards/a/AncientSpring.java index 2d152d6c544..903f23e835f 100644 --- a/Mage.Sets/src/mage/cards/a/AncientSpring.java +++ b/Mage.Sets/src/mage/cards/a/AncientSpring.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AncientStirrings.java b/Mage.Sets/src/mage/cards/a/AncientStirrings.java index 7c5ac0cdcc6..048abd3e05a 100644 --- a/Mage.Sets/src/mage/cards/a/AncientStirrings.java +++ b/Mage.Sets/src/mage/cards/a/AncientStirrings.java @@ -28,16 +28,16 @@ package mage.cards.a; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorlessPredicate; import java.util.UUID; -import mage.constants.Zone; /** * @author LevelX diff --git a/Mage.Sets/src/mage/cards/a/AncientTomb.java b/Mage.Sets/src/mage/cards/a/AncientTomb.java index e139dffed54..f013bd9357e 100644 --- a/Mage.Sets/src/mage/cards/a/AncientTomb.java +++ b/Mage.Sets/src/mage/cards/a/AncientTomb.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -37,8 +34,11 @@ import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java index 86d87bd3e10..4daa66ee6e3 100644 --- a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java +++ b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java b/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java index 75dc0cec444..a9381c7c9ad 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -48,6 +47,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AngelOfDespair.java b/Mage.Sets/src/mage/cards/a/AngelOfDespair.java index ca11a8fd91f..87f08f49eb6 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfDespair.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfDespair.java @@ -28,8 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,8 +35,11 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AngelOfFinality.java b/Mage.Sets/src/mage/cards/a/AngelOfFinality.java index 030360e4ebe..4db2a7d9114 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfFinality.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfFinality.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelOfFury.java b/Mage.Sets/src/mage/cards/a/AngelOfFury.java index 5694931a514..d29fe55c92c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfFury.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java b/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java index 05ee7eb8976..c0be93aad68 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; @@ -47,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AngelOfInvention.java b/Mage.Sets/src/mage/cards/a/AngelOfInvention.java index 788110f2fbb..8dd81a3f39a 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfInvention.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfInvention.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java index 169f9c16bcb..9fe8cc07ec2 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,14 +41,7 @@ import mage.abilities.keyword.FlashbackAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityType; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -59,6 +50,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/a/AngelOfLight.java b/Mage.Sets/src/mage/cards/a/AngelOfLight.java index 46ec9fb7b45..ae796e5bb1e 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfLight.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfLight.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelOfMercy.java b/Mage.Sets/src/mage/cards/a/AngelOfMercy.java index 95ad58067a4..d6bb7782f20 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfMercy.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfMercy.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AngelOfRenewal.java b/Mage.Sets/src/mage/cards/a/AngelOfRenewal.java index 1340bbfa871..22d13112b8c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfRenewal.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfRenewal.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelOfRetribution.java b/Mage.Sets/src/mage/cards/a/AngelOfRetribution.java index 677f335f4be..03c63519bdd 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfRetribution.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfRetribution.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java b/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java index 4d244ca121d..b0b4f0e5ef0 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java b/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java index 9d178148156..d9dcc7da6bd 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -55,6 +54,8 @@ import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java b/Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java index 67c31659e2b..171fd05b33d 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.CastFromHandSourceCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.filter.common.FilterAttackingCreature; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java b/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java index 5102eb1d16a..7877fd775b3 100644 --- a/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java +++ b/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java @@ -28,15 +28,18 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AngelheartVial.java b/Mage.Sets/src/mage/cards/a/AngelheartVial.java index b118f117a08..ca01f368c8c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelheartVial.java +++ b/Mage.Sets/src/mage/cards/a/AngelheartVial.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AngelicAccord.java b/Mage.Sets/src/mage/cards/a/AngelicAccord.java index 83d8cf82c42..5f4610ac060 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicAccord.java +++ b/Mage.Sets/src/mage/cards/a/AngelicAccord.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.token.AngelToken; import mage.watchers.common.PlayerGainedLifeWatcher; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java index 4c61d2ad675..459a6c314e6 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,11 +36,7 @@ import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -51,6 +44,10 @@ import mage.game.permanent.Permanent; import mage.watchers.Watcher; import mage.watchers.common.CastSpellLastTurnWatcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AngelicArmaments.java b/Mage.Sets/src/mage/cards/a/AngelicArmaments.java index a707e53af73..2b74a633a79 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicArmaments.java +++ b/Mage.Sets/src/mage/cards/a/AngelicArmaments.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import mage.constants.*; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AngelicBenediction.java b/Mage.Sets/src/mage/cards/a/AngelicBenediction.java index 746c1f829ec..b90cae394c3 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicBenediction.java +++ b/Mage.Sets/src/mage/cards/a/AngelicBenediction.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.ExaltedAbility; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AngelicBlessing.java b/Mage.Sets/src/mage/cards/a/AngelicBlessing.java index 4d482672adb..f67deac8a53 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicBlessing.java +++ b/Mage.Sets/src/mage/cards/a/AngelicBlessing.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java index 410ab53807b..87260f921e3 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java +++ b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -41,6 +40,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AngelicChorus.java b/Mage.Sets/src/mage/cards/a/AngelicChorus.java index 945844c7cfd..19388db94e8 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicChorus.java +++ b/Mage.Sets/src/mage/cards/a/AngelicChorus.java @@ -27,21 +27,22 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AngelicCurator.java b/Mage.Sets/src/mage/cards/a/AngelicCurator.java index b55fbea8cde..a77a86ea8a1 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicCurator.java +++ b/Mage.Sets/src/mage/cards/a/AngelicCurator.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterArtifactCard; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java index b783bcc7a5a..220c8aed0a5 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java +++ b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,14 +41,12 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AngelicEdict.java b/Mage.Sets/src/mage/cards/a/AngelicEdict.java index 9b3846386ba..c1266fc0e0b 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicEdict.java +++ b/Mage.Sets/src/mage/cards/a/AngelicEdict.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelicFieldMarshal.java b/Mage.Sets/src/mage/cards/a/AngelicFieldMarshal.java index ed54cf1e642..7371c50b449 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicFieldMarshal.java +++ b/Mage.Sets/src/mage/cards/a/AngelicFieldMarshal.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.LieutenantAbility; import mage.abilities.effects.ContinuousEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AngelicGift.java b/Mage.Sets/src/mage/cards/a/AngelicGift.java index 68e5a34e08b..67ec89e9739 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicGift.java +++ b/Mage.Sets/src/mage/cards/a/AngelicGift.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java index 595cab91747..69b9df63453 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java +++ b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java @@ -27,22 +27,24 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; -import mage.abilities.keyword.*; +import mage.abilities.keyword.FlyingAbility; +import mage.abilities.keyword.HexproofAbility; +import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/a/AngelicPage.java b/Mage.Sets/src/mage/cards/a/AngelicPage.java index 6ee1847c6ef..a3810ca6f9c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicPage.java +++ b/Mage.Sets/src/mage/cards/a/AngelicPage.java @@ -27,10 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +35,14 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AngelicProtector.java b/Mage.Sets/src/mage/cards/a/AngelicProtector.java index 084e28ea50f..4d2f774246c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicProtector.java +++ b/Mage.Sets/src/mage/cards/a/AngelicProtector.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AngelicPurge.java b/Mage.Sets/src/mage/cards/a/AngelicPurge.java index 225389a65a2..ae489d17b78 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicPurge.java +++ b/Mage.Sets/src/mage/cards/a/AngelicPurge.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AngelicRenewal.java b/Mage.Sets/src/mage/cards/a/AngelicRenewal.java index e3be878cc69..32a4ac7e98d 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicRenewal.java +++ b/Mage.Sets/src/mage/cards/a/AngelicRenewal.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DoIfCostPaid; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AngelicShield.java b/Mage.Sets/src/mage/cards/a/AngelicShield.java index 4d6f47ba632..2f34652563a 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicShield.java +++ b/Mage.Sets/src/mage/cards/a/AngelicShield.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java b/Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java index 7057286191d..dc0b0550281 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java +++ b/Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -52,6 +49,10 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelicWall.java b/Mage.Sets/src/mage/cards/a/AngelicWall.java index f21bb3c16d5..528e6193c45 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicWall.java +++ b/Mage.Sets/src/mage/cards/a/AngelicWall.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AngelsFeather.java b/Mage.Sets/src/mage/cards/a/AngelsFeather.java index 58e5cd315f6..f6e9f1115c5 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsFeather.java +++ b/Mage.Sets/src/mage/cards/a/AngelsFeather.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AngelsGrace.java b/Mage.Sets/src/mage/cards/a/AngelsGrace.java index 9beff9bc78f..1339cee57fb 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsGrace.java +++ b/Mage.Sets/src/mage/cards/a/AngelsGrace.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; @@ -42,6 +41,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AngelsHerald.java b/Mage.Sets/src/mage/cards/a/AngelsHerald.java index 95cc0ba14da..6303c8dd16c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsHerald.java +++ b/Mage.Sets/src/mage/cards/a/AngelsHerald.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +37,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/a/AngelsMercy.java b/Mage.Sets/src/mage/cards/a/AngelsMercy.java index e0133703e50..5bf7483a1c0 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsMercy.java +++ b/Mage.Sets/src/mage/cards/a/AngelsMercy.java @@ -28,11 +28,12 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AngelsTomb.java b/Mage.Sets/src/mage/cards/a/AngelsTomb.java index 004747ee28d..2c7efe99ede 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTomb.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTomb.java @@ -27,18 +27,18 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java index 11f5f57d65b..d1e09ed8d3e 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -36,17 +35,15 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Angelsong.java b/Mage.Sets/src/mage/cards/a/Angelsong.java index b4e912f688c..4de6172f888 100644 --- a/Mage.Sets/src/mage/cards/a/Angelsong.java +++ b/Mage.Sets/src/mage/cards/a/Angelsong.java @@ -28,14 +28,15 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/Anger.java b/Mage.Sets/src/mage/cards/a/Anger.java index f9cfdcb1950..b8ac2a50ff3 100644 --- a/Mage.Sets/src/mage/cards/a/Anger.java +++ b/Mage.Sets/src/mage/cards/a/Anger.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -38,6 +36,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AngerOfTheGods.java b/Mage.Sets/src/mage/cards/a/AngerOfTheGods.java index 38757491f74..b1b8568258e 100644 --- a/Mage.Sets/src/mage/cards/a/AngerOfTheGods.java +++ b/Mage.Sets/src/mage/cards/a/AngerOfTheGods.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.replacement.DealtDamageToCreatureBySourceDies; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AngryMob.java b/Mage.Sets/src/mage/cards/a/AngryMob.java index 45258ad1f26..af5bd0c1808 100644 --- a/Mage.Sets/src/mage/cards/a/AngryMob.java +++ b/Mage.Sets/src/mage/cards/a/AngryMob.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurnCondition; @@ -45,6 +44,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AnguishedUnmaking.java b/Mage.Sets/src/mage/cards/a/AnguishedUnmaking.java index 5f98bef3a45..afdbb5a5c23 100644 --- a/Mage.Sets/src/mage/cards/a/AnguishedUnmaking.java +++ b/Mage.Sets/src/mage/cards/a/AnguishedUnmaking.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AngusMackenzie.java b/Mage.Sets/src/mage/cards/a/AngusMackenzie.java index e933e4cb054..32bff00ff0e 100644 --- a/Mage.Sets/src/mage/cards/a/AngusMackenzie.java +++ b/Mage.Sets/src/mage/cards/a/AngusMackenzie.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -38,12 +37,11 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.PhaseStep; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; +import java.util.UUID; + /** * * @author shieldal @@ -52,7 +50,7 @@ public class AngusMackenzie extends CardImpl { public AngusMackenzie(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java index 07f19f2005b..394053717c7 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java +++ b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,17 +40,15 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/a/AnimalMagnetism.java b/Mage.Sets/src/mage/cards/a/AnimalMagnetism.java index f8feee0c495..8e4c02747da 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalMagnetism.java +++ b/Mage.Sets/src/mage/cards/a/AnimalMagnetism.java @@ -27,16 +27,10 @@ */ package mage.cards.a; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -47,6 +41,9 @@ import mage.target.Target; import mage.target.TargetCard; import mage.target.common.TargetOpponent; +import java.util.Set; +import java.util.UUID; + /** * * @author fenhl diff --git a/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java b/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java index 761c7e064e8..dc72fb7b7ba 100644 --- a/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java +++ b/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,17 +40,15 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +57,7 @@ public class AnimarSoulOfElements extends CardImpl { public AnimarSoulOfElements(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java index 8f50b302153..777a588ddfe 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java +++ b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -35,12 +34,7 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; @@ -50,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author MTGfan diff --git a/Mage.Sets/src/mage/cards/a/AnimateDead.java b/Mage.Sets/src/mage/cards/a/AnimateDead.java index ed0575a5c7d..dae14d60c2a 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateDead.java +++ b/Mage.Sets/src/mage/cards/a/AnimateDead.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,12 +42,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.PermanentIdPredicate; @@ -59,6 +53,8 @@ import mage.target.Target; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AnimateLand.java b/Mage.Sets/src/mage/cards/a/AnimateLand.java index 662b86d37ae..603a2e57c3b 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateLand.java +++ b/Mage.Sets/src/mage/cards/a/AnimateLand.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.Duration; import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AnimateWall.java b/Mage.Sets/src/mage/cards/a/AnimateWall.java index 67dbfc0245c..aed2c8b488d 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateWall.java +++ b/Mage.Sets/src/mage/cards/a/AnimateWall.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -37,16 +36,14 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AnimationModule.java b/Mage.Sets/src/mage/cards/a/AnimationModule.java index 8b041211fb1..1b35a02db1a 100644 --- a/Mage.Sets/src/mage/cards/a/AnimationModule.java +++ b/Mage.Sets/src/mage/cards/a/AnimationModule.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -54,6 +51,10 @@ import mage.game.permanent.token.ServoToken; import mage.players.Player; import mage.target.common.TargetPermanentOrPlayer; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AnimistsAwakening.java b/Mage.Sets/src/mage/cards/a/AnimistsAwakening.java index 79749f37c07..f8fdf258e8b 100644 --- a/Mage.Sets/src/mage/cards/a/AnimistsAwakening.java +++ b/Mage.Sets/src/mage/cards/a/AnimistsAwakening.java @@ -27,18 +27,11 @@ */ package mage.cards.a; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.condition.common.SpellMasteryCondition; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -47,6 +40,10 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AnkhOfMishra.java b/Mage.Sets/src/mage/cards/a/AnkhOfMishra.java index 38272e1e8ef..50ff0f7db05 100644 --- a/Mage.Sets/src/mage/cards/a/AnkhOfMishra.java +++ b/Mage.Sets/src/mage/cards/a/AnkhOfMishra.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/a/AnkleShanker.java b/Mage.Sets/src/mage/cards/a/AnkleShanker.java index add856199c7..a34c8c566f6 100644 --- a/Mage.Sets/src/mage/cards/a/AnkleShanker.java +++ b/Mage.Sets/src/mage/cards/a/AnkleShanker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Annex.java b/Mage.Sets/src/mage/cards/a/Annex.java index ea738937070..7e7bb91e6cb 100644 --- a/Mage.Sets/src/mage/cards/a/Annex.java +++ b/Mage.Sets/src/mage/cards/a/Annex.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author andyfries diff --git a/Mage.Sets/src/mage/cards/a/Annihilate.java b/Mage.Sets/src/mage/cards/a/Annihilate.java index e59040bdc02..f5aa6b34953 100644 --- a/Mage.Sets/src/mage/cards/a/Annihilate.java +++ b/Mage.Sets/src/mage/cards/a/Annihilate.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java b/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java index 44148bda0f1..47155e22fcc 100644 --- a/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java +++ b/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java @@ -29,7 +29,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.replacement.DealtDamageToCreatureBySourceDies; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Annul.java b/Mage.Sets/src/mage/cards/a/Annul.java index c8a6dac76dc..9700ff565d8 100644 --- a/Mage.Sets/src/mage/cards/a/Annul.java +++ b/Mage.Sets/src/mage/cards/a/Annul.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AnodetLurker.java b/Mage.Sets/src/mage/cards/a/AnodetLurker.java index c123e7dfd70..a5e4e9b946d 100644 --- a/Mage.Sets/src/mage/cards/a/AnodetLurker.java +++ b/Mage.Sets/src/mage/cards/a/AnodetLurker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/Anoint.java b/Mage.Sets/src/mage/cards/a/Anoint.java index a2cb5108970..9f396c0830e 100644 --- a/Mage.Sets/src/mage/cards/a/Anoint.java +++ b/Mage.Sets/src/mage/cards/a/Anoint.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java b/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java index 0d9ce6b8200..2d14b85606e 100644 --- a/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java +++ b/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java b/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java index c438949df6b..9263e699b50 100644 --- a/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java +++ b/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java @@ -27,18 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North @@ -53,7 +55,7 @@ public class AnowonTheRuinSage extends CardImpl { public AnowonTheRuinSage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/a/AntQueen.java b/Mage.Sets/src/mage/cards/a/AntQueen.java index 5dd424f444e..555bb7f3b1e 100644 --- a/Mage.Sets/src/mage/cards/a/AntQueen.java +++ b/Mage.Sets/src/mage/cards/a/AntQueen.java @@ -28,17 +28,18 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.game.permanent.token.InsectToken; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java b/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java index 30c7c41e68e..478a8edf96f 100644 --- a/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java +++ b/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +44,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * @author JotaPeRL */ diff --git a/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java b/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java index 7f524c2f2f6..75df207e877 100644 --- a/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java +++ b/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; @@ -36,10 +35,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -48,7 +50,7 @@ public class AnthousaSetessanHero extends CardImpl { public AnthousaSetessanHero(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/a/Anthroplasm.java b/Mage.Sets/src/mage/cards/a/Anthroplasm.java index 886ef47a3ae..1dea93ba20d 100644 --- a/Mage.Sets/src/mage/cards/a/Anthroplasm.java +++ b/Mage.Sets/src/mage/cards/a/Anthroplasm.java @@ -27,10 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,11 +37,15 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/Anticipate.java b/Mage.Sets/src/mage/cards/a/Anticipate.java index 4cda55ca800..106519c687b 100644 --- a/Mage.Sets/src/mage/cards/a/Anticipate.java +++ b/Mage.Sets/src/mage/cards/a/Anticipate.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java b/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java index 3326938e668..9e1724ce9be 100644 --- a/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java +++ b/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java b/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java index b3ead0d1cad..ca3ea0b9550 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java b/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java index 2edcec02f5b..f0eda5292eb 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java b/Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java index 9098bf484ee..b0d62d4e615 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java +++ b/Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java b/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java index f09075814cb..71fa40c60a7 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java b/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java index 5a4c88cca67..5f0e9cb50a0 100644 --- a/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java +++ b/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java @@ -27,13 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,9 +36,12 @@ import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect.HandSizeModification; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java b/Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java index 63db5d47412..461d975b9e9 100644 --- a/Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java +++ b/Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java index 45197ed337a..c0ef10ef1a0 100644 --- a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java +++ b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,10 +43,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 @@ -56,7 +58,7 @@ public class AnyaMercilessAngel extends CardImpl { public AnyaMercilessAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ApesOfRath.java b/Mage.Sets/src/mage/cards/a/ApesOfRath.java index 3a941c2befc..77a7e5a1bad 100644 --- a/Mage.Sets/src/mage/cards/a/ApesOfRath.java +++ b/Mage.Sets/src/mage/cards/a/ApesOfRath.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ApexHawks.java b/Mage.Sets/src/mage/cards/a/ApexHawks.java index d5ac9aa405e..863b99b1dfb 100644 --- a/Mage.Sets/src/mage/cards/a/ApexHawks.java +++ b/Mage.Sets/src/mage/cards/a/ApexHawks.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; @@ -37,8 +35,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java index 93af2c99a07..d8b799f8d20 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java +++ b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AphettoDredging.java b/Mage.Sets/src/mage/cards/a/AphettoDredging.java index c1cfbffbf10..51cb31efe5c 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoDredging.java +++ b/Mage.Sets/src/mage/cards/a/AphettoDredging.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java index 5a3e3b0c552..61d641d6456 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java +++ b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AphettoRunecaster.java b/Mage.Sets/src/mage/cards/a/AphettoRunecaster.java index 0d58abddb44..1323150acf2 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoRunecaster.java +++ b/Mage.Sets/src/mage/cards/a/AphettoRunecaster.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.TurnedFaceUpAllTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AphoticWisps.java b/Mage.Sets/src/mage/cards/a/AphoticWisps.java index 7c7bc2058b1..d982aebc3e3 100644 --- a/Mage.Sets/src/mage/cards/a/AphoticWisps.java +++ b/Mage.Sets/src/mage/cards/a/AphoticWisps.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/a/Apocalypse.java b/Mage.Sets/src/mage/cards/a/Apocalypse.java index cffb38ba31c..c7f5d10d797 100644 --- a/Mage.Sets/src/mage/cards/a/Apocalypse.java +++ b/Mage.Sets/src/mage/cards/a/Apocalypse.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author markedagain diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java b/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java index 0c34f7fcff8..5a9fca8f82b 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ApostlesBlessing.java b/Mage.Sets/src/mage/cards/a/ApostlesBlessing.java index 78d95a968c9..9b3fc125cfd 100644 --- a/Mage.Sets/src/mage/cards/a/ApostlesBlessing.java +++ b/Mage.Sets/src/mage/cards/a/ApostlesBlessing.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -40,6 +36,8 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.ChoiceColorOrArtifact; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; @@ -50,6 +48,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java index e0fdd4c000a..dd3e34c4427 100644 --- a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java +++ b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.TriggeredAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java b/Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java index b34f953f67c..08eebebe604 100644 --- a/Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java +++ b/Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastAllTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java b/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java index 12c91298a89..4b152fd09d7 100644 --- a/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java +++ b/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.ExileCardYouChooseTargetOpponentEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AppetiteForTheUnnatural.java b/Mage.Sets/src/mage/cards/a/AppetiteForTheUnnatural.java index a4ae37c7b17..7782b08aaba 100644 --- a/Mage.Sets/src/mage/cards/a/AppetiteForTheUnnatural.java +++ b/Mage.Sets/src/mage/cards/a/AppetiteForTheUnnatural.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java b/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java index 9c37338b784..6ef369d6285 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -44,11 +43,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -56,6 +51,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java b/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java index 472a4258747..493eb87b5b0 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeWizard.java b/Mage.Sets/src/mage/cards/a/ApprenticeWizard.java index 07c704a6025..2e9199a8284 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeWizard.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeWizard.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AqualishBountyHunter.java b/Mage.Sets/src/mage/cards/a/AqualishBountyHunter.java index 00821fa01bf..4c78910661d 100644 --- a/Mage.Sets/src/mage/cards/a/AqualishBountyHunter.java +++ b/Mage.Sets/src/mage/cards/a/AqualishBountyHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/Aquamoeba.java b/Mage.Sets/src/mage/cards/a/Aquamoeba.java index 0b3f7b5b2c9..aba67e1edef 100644 --- a/Mage.Sets/src/mage/cards/a/Aquamoeba.java +++ b/Mage.Sets/src/mage/cards/a/Aquamoeba.java @@ -27,13 +27,13 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.common.continuous.SwitchPowerToughnessSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java index 7a56b32b9f1..4524c52c54c 100644 --- a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java +++ b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,11 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -51,6 +46,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AquastrandSpider.java b/Mage.Sets/src/mage/cards/a/AquastrandSpider.java index ee23651c144..3fa1613b566 100644 --- a/Mage.Sets/src/mage/cards/a/AquastrandSpider.java +++ b/Mage.Sets/src/mage/cards/a/AquastrandSpider.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author JotaPeRL diff --git a/Mage.Sets/src/mage/cards/a/AqueousForm.java b/Mage.Sets/src/mage/cards/a/AqueousForm.java index f953dc600f8..8f348432183 100644 --- a/Mage.Sets/src/mage/cards/a/AqueousForm.java +++ b/Mage.Sets/src/mage/cards/a/AqueousForm.java @@ -27,13 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.combat.CantBeBlockedAttachedEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AquitectsWill.java b/Mage.Sets/src/mage/cards/a/AquitectsWill.java index bb866804895..46ad85d7c1c 100644 --- a/Mage.Sets/src/mage/cards/a/AquitectsWill.java +++ b/Mage.Sets/src/mage/cards/a/AquitectsWill.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/a/AquusSteed.java b/Mage.Sets/src/mage/cards/a/AquusSteed.java index 8cd43bc1b1a..3ce227c730a 100644 --- a/Mage.Sets/src/mage/cards/a/AquusSteed.java +++ b/Mage.Sets/src/mage/cards/a/AquusSteed.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArabaMothrider.java b/Mage.Sets/src/mage/cards/a/ArabaMothrider.java index f29905ee363..acb4a3ec158 100644 --- a/Mage.Sets/src/mage/cards/a/ArabaMothrider.java +++ b/Mage.Sets/src/mage/cards/a/ArabaMothrider.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.BushidoAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/Arachnogenesis.java b/Mage.Sets/src/mage/cards/a/Arachnogenesis.java index 549eba2687c..5a91103fcec 100644 --- a/Mage.Sets/src/mage/cards/a/Arachnogenesis.java +++ b/Mage.Sets/src/mage/cards/a/Arachnogenesis.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.token.SpiderToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Arachnoid.java b/Mage.Sets/src/mage/cards/a/Arachnoid.java index 74e008474bc..00a926d51ae 100644 --- a/Mage.Sets/src/mage/cards/a/Arachnoid.java +++ b/Mage.Sets/src/mage/cards/a/Arachnoid.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java index 58b0505b7bb..f8f543987d6 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java @@ -27,10 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +36,9 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -54,6 +53,8 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java index e99fa9b7c34..ef60ba9e6a3 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AradaraExpress.java b/Mage.Sets/src/mage/cards/a/AradaraExpress.java index 1560a633ede..ef77fec67a4 100644 --- a/Mage.Sets/src/mage/cards/a/AradaraExpress.java +++ b/Mage.Sets/src/mage/cards/a/AradaraExpress.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.MenaceAbility; import mage.abilities.keyword.CrewAbility; +import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java b/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java index d77dbb412c7..48e28ea55b4 100644 --- a/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java +++ b/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,11 +40,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +62,7 @@ public class ArashiTheSkyAsunder extends CardImpl { public ArashiTheSkyAsunder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArashinCleric.java b/Mage.Sets/src/mage/cards/a/ArashinCleric.java index bfbf05e5938..7997b70f666 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinCleric.java +++ b/Mage.Sets/src/mage/cards/a/ArashinCleric.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArashinForemost.java b/Mage.Sets/src/mage/cards/a/ArashinForemost.java index bb1c83664de..d5df7bf0a3b 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinForemost.java +++ b/Mage.Sets/src/mage/cards/a/ArashinForemost.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArashinSovereign.java b/Mage.Sets/src/mage/cards/a/ArashinSovereign.java index c7bb7b0529c..8565087f06b 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinSovereign.java +++ b/Mage.Sets/src/mage/cards/a/ArashinSovereign.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArashinWarBeast.java b/Mage.Sets/src/mage/cards/a/ArashinWarBeast.java index b6b89177b22..ae00c407dc6 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinWarBeast.java +++ b/Mage.Sets/src/mage/cards/a/ArashinWarBeast.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArbalestElite.java b/Mage.Sets/src/mage/cards/a/ArbalestElite.java index aebc4001cc7..4c612a9c2b5 100644 --- a/Mage.Sets/src/mage/cards/a/ArbalestElite.java +++ b/Mage.Sets/src/mage/cards/a/ArbalestElite.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +36,12 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/a/ArbiterOfKnollridge.java b/Mage.Sets/src/mage/cards/a/ArbiterOfKnollridge.java index cb697534186..daf4302bc51 100644 --- a/Mage.Sets/src/mage/cards/a/ArbiterOfKnollridge.java +++ b/Mage.Sets/src/mage/cards/a/ArbiterOfKnollridge.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,11 +34,14 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.players.PlayerList; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java b/Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java index 7b130e201c8..eaea3de63ce 100644 --- a/Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java +++ b/Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; @@ -35,11 +34,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.AddCardTypeTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.InspiredAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -53,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArborColossus.java b/Mage.Sets/src/mage/cards/a/ArborColossus.java index 29bc4dee568..09142373925 100644 --- a/Mage.Sets/src/mage/cards/a/ArborColossus.java +++ b/Mage.Sets/src/mage/cards/a/ArborColossus.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArborElf.java b/Mage.Sets/src/mage/cards/a/ArborElf.java index 5220d7ad9da..c5bc1f38f5a 100644 --- a/Mage.Sets/src/mage/cards/a/ArborElf.java +++ b/Mage.Sets/src/mage/cards/a/ArborElf.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,13 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/ArborbackStomper.java b/Mage.Sets/src/mage/cards/a/ArborbackStomper.java index b5d5cec8c02..7d35f744c21 100644 --- a/Mage.Sets/src/mage/cards/a/ArborbackStomper.java +++ b/Mage.Sets/src/mage/cards/a/ArborbackStomper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcBlade.java b/Mage.Sets/src/mage/cards/a/ArcBlade.java index c79568aab84..ef2157e45d2 100644 --- a/Mage.Sets/src/mage/cards/a/ArcBlade.java +++ b/Mage.Sets/src/mage/cards/a/ArcBlade.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/ArcLightning.java b/Mage.Sets/src/mage/cards/a/ArcLightning.java index 400e66b70f5..97d88e605fe 100644 --- a/Mage.Sets/src/mage/cards/a/ArcLightning.java +++ b/Mage.Sets/src/mage/cards/a/ArcLightning.java @@ -28,13 +28,14 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/ArcMage.java b/Mage.Sets/src/mage/cards/a/ArcMage.java index 737ec1a9cad..e6623bee5d7 100644 --- a/Mage.Sets/src/mage/cards/a/ArcMage.java +++ b/Mage.Sets/src/mage/cards/a/ArcMage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArcRunner.java b/Mage.Sets/src/mage/cards/a/ArcRunner.java index 6019fa06abe..e7528ad0172 100644 --- a/Mage.Sets/src/mage/cards/a/ArcRunner.java +++ b/Mage.Sets/src/mage/cards/a/ArcRunner.java @@ -28,16 +28,17 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/ArcSlogger.java b/Mage.Sets/src/mage/cards/a/ArcSlogger.java index f63de9482ab..bd38a440b2f 100644 --- a/Mage.Sets/src/mage/cards/a/ArcSlogger.java +++ b/Mage.Sets/src/mage/cards/a/ArcSlogger.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ArcTrail.java b/Mage.Sets/src/mage/cards/a/ArcTrail.java index c41608f025a..1858b3e8da8 100644 --- a/Mage.Sets/src/mage/cards/a/ArcTrail.java +++ b/Mage.Sets/src/mage/cards/a/ArcTrail.java @@ -28,15 +28,13 @@ package mage.cards.a; -import java.io.ObjectStreamException; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterCreatureOrPlayer; import mage.filter.predicate.mageobject.AnotherTargetPredicate; import mage.game.Game; @@ -45,6 +43,9 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; +import java.io.ObjectStreamException; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java index 9139cdd57a3..4a824bfb30d 100644 --- a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java +++ b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,18 +38,16 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; +import java.util.UUID; + /** - * * @author fireshoes */ public class ArcadesSabboth extends CardImpl { @@ -64,8 +61,8 @@ public class ArcadesSabboth extends CardImpl { } public ArcadesSabboth(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}{W}{W}{U}{U}"); - this.supertype.add("Legendary"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{W}{W}{U}{U}"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneDenial.java b/Mage.Sets/src/mage/cards/a/ArcaneDenial.java index 2f1a2d7a688..8e5379ad118 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneDenial.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneDenial.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.TargetSpell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java b/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java index 0f749d10135..4aa2f26e2ca 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.CantCastMoreThanOneSpellEffect; import mage.cards.CardImpl; @@ -37,6 +35,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java b/Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java index ba14e507ec9..609398594af 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcaneMelee.java b/Mage.Sets/src/mage/cards/a/ArcaneMelee.java index ff570c21f1e..6780c29c314 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneMelee.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneMelee.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; @@ -36,6 +35,7 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.util.CardUtil; diff --git a/Mage.Sets/src/mage/cards/a/ArcaneSanctum.java b/Mage.Sets/src/mage/cards/a/ArcaneSanctum.java index 4ce05282c5a..c71b48fbeec 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneSanctum.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneSanctum.java @@ -28,14 +28,15 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java b/Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java index 78dc0c33060..4caa554be1f 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneSpyglass.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -41,12 +38,15 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java index ea9d3c1a1ef..d0d60ea55f4 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,10 +38,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java b/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java index bf488254741..c1ec7d60491 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java +++ b/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,8 +35,12 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki @@ -48,7 +49,7 @@ public class ArcanisTheOmnipotent extends CardImpl { public ArcanisTheOmnipotent(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArcanumWings.java b/Mage.Sets/src/mage/cards/a/ArcanumWings.java index 1602558222c..9616536cc7a 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanumWings.java +++ b/Mage.Sets/src/mage/cards/a/ArcanumWings.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/Arcbond.java b/Mage.Sets/src/mage/cards/a/Arcbond.java index dcbebf752c8..4a867f4a255 100644 --- a/Mage.Sets/src/mage/cards/a/Arcbond.java +++ b/Mage.Sets/src/mage/cards/a/Arcbond.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; @@ -51,6 +50,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcboundBruiser.java b/Mage.Sets/src/mage/cards/a/ArcboundBruiser.java index 7485064c728..20029352fc7 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundBruiser.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundBruiser.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java b/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java index f1a9bb87d78..fe75c84ad66 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcboundHybrid.java b/Mage.Sets/src/mage/cards/a/ArcboundHybrid.java index a9c70b06ce1..89657ab0eb6 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundHybrid.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundHybrid.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArcboundLancer.java b/Mage.Sets/src/mage/cards/a/ArcboundLancer.java index b728768e2cf..e9d5cf44238 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundLancer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundLancer.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArcboundOverseer.java b/Mage.Sets/src/mage/cards/a/ArcboundOverseer.java index bd78b80c530..f2e650a5dba 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundOverseer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundOverseer.java @@ -27,19 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/a/ArcboundRavager.java b/Mage.Sets/src/mage/cards/a/ArcboundRavager.java index 36178029941..fdbdadeb13b 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundRavager.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundRavager.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,11 +34,15 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java b/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java index e667485ee5d..8f24c2ae189 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcboundSlith.java b/Mage.Sets/src/mage/cards/a/ArcboundSlith.java index 2c715739c97..e040ac16cb6 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundSlith.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundSlith.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcboundStinger.java b/Mage.Sets/src/mage/cards/a/ArcboundStinger.java index 13d2e310e1b..204bc8949a7 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundStinger.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundStinger.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArcboundWanderer.java b/Mage.Sets/src/mage/cards/a/ArcboundWanderer.java index 7a67cf9ca7a..27b54f4889d 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundWanderer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundWanderer.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcboundWorker.java b/Mage.Sets/src/mage/cards/a/ArcboundWorker.java index 9ad18979d21..ff111ed1a13 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundWorker.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundWorker.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchaeologicalDig.java b/Mage.Sets/src/mage/cards/a/ArchaeologicalDig.java index 012ad1b1b74..f8cf97e2505 100644 --- a/Mage.Sets/src/mage/cards/a/ArchaeologicalDig.java +++ b/Mage.Sets/src/mage/cards/a/ArchaeologicalDig.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/Archaeomancer.java b/Mage.Sets/src/mage/cards/a/Archaeomancer.java index dc2935498f3..97ccb7e0446 100644 --- a/Mage.Sets/src/mage/cards/a/Archaeomancer.java +++ b/Mage.Sets/src/mage/cards/a/Archaeomancer.java @@ -27,19 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/Archangel.java b/Mage.Sets/src/mage/cards/a/Archangel.java index 9362864edd0..780e4de9e70 100644 --- a/Mage.Sets/src/mage/cards/a/Archangel.java +++ b/Mage.Sets/src/mage/cards/a/Archangel.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java b/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java index 4e4c69efaef..8e6c6c7622a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -38,17 +37,10 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.TransformTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; -import mage.abilities.keyword.FlashAbility; -import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.IndestructibleAbility; -import mage.abilities.keyword.TransformAbility; -import mage.abilities.keyword.VigilanceAbility; +import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -58,6 +50,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes @@ -73,7 +67,8 @@ public class ArchangelAvacyn extends CardImpl { public ArchangelAvacyn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java b/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java index 05d31f7ccc3..2c0c9355e6a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Eirkei diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfThune.java b/Mage.Sets/src/mage/cards/a/ArchangelOfThune.java index 9d1dc14deab..7665b639184 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfThune.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfThune.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersAllEffect; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java b/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java index 068d5bf7083..a64ebeb1ed1 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchangelsLight.java b/Mage.Sets/src/mage/cards/a/ArchangelsLight.java index 8724a00c09e..d222f56ba2c 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelsLight.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelsLight.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; @@ -37,11 +34,14 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java b/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java index 3aad68d13fc..360062f5624 100644 --- a/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java +++ b/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java b/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java index 6741bdb2f9b..fe107a2af5e 100644 --- a/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java +++ b/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ReachAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArchersParapet.java b/Mage.Sets/src/mage/cards/a/ArchersParapet.java index f8acf3130da..1d5a90c762c 100644 --- a/Mage.Sets/src/mage/cards/a/ArchersParapet.java +++ b/Mage.Sets/src/mage/cards/a/ArchersParapet.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java index 16dc8ee9645..719fdd37654 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.CreaturesCantGetOrHaveAbilityEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java index 78f9f28040f..d04ad2f2938 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.CreaturesCantGetOrHaveAbilityEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java index 5acc9d87297..be83580eefc 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.CreaturesCantGetOrHaveAbilityEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java index 1ad6ebf022a..04d60bdf255 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.CreaturesCantGetOrHaveAbilityEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java index 6c671099950..610d547d5b3 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.CreaturesCantGetOrHaveAbilityEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java index dd810e4e201..2189f6d0ea6 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -46,6 +43,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java b/Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java index 2cfb9433d03..1e1011249e1 100644 --- a/Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java +++ b/Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java b/Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java index b22f68e7813..bffeaf89ba0 100644 --- a/Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java +++ b/Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java @@ -27,24 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.CyclingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/ArchiveTrap.java b/Mage.Sets/src/mage/cards/a/ArchiveTrap.java index 9bea0d1ec89..a2af1dbd234 100644 --- a/Mage.Sets/src/mage/cards/a/ArchiveTrap.java +++ b/Mage.Sets/src/mage/cards/a/ArchiveTrap.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; @@ -46,6 +43,10 @@ import mage.players.Player; import mage.target.common.TargetOpponent; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage.Sets/src/mage/cards/a/Archivist.java b/Mage.Sets/src/mage/cards/a/Archivist.java index a80896f67b0..4e262df9a55 100644 --- a/Mage.Sets/src/mage/cards/a/Archivist.java +++ b/Mage.Sets/src/mage/cards/a/Archivist.java @@ -27,17 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/ArchmageAscension.java b/Mage.Sets/src/mage/cards/a/ArchmageAscension.java index 524fca1fb9c..aa0a0c2beba 100644 --- a/Mage.Sets/src/mage/cards/a/ArchmageAscension.java +++ b/Mage.Sets/src/mage/cards/a/ArchmageAscension.java @@ -35,7 +35,10 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java b/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java index f9bf2d689bd..0efd96ae325 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author North, Loki diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java b/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java index 748d488698a..a8254d3fb99 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java b/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java index 785bd5da688..084173f2992 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -37,11 +34,14 @@ import mage.abilities.effects.common.DetainTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Archweaver.java b/Mage.Sets/src/mage/cards/a/Archweaver.java index cfeee1dcd81..2d8e23335ac 100644 --- a/Mage.Sets/src/mage/cards/a/Archweaver.java +++ b/Mage.Sets/src/mage/cards/a/Archweaver.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArchwingDragon.java b/Mage.Sets/src/mage/cards/a/ArchwingDragon.java index 04ed8fbe84b..2903ca6a7e9 100644 --- a/Mage.Sets/src/mage/cards/a/ArchwingDragon.java +++ b/Mage.Sets/src/mage/cards/a/ArchwingDragon.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -36,8 +34,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArcticAven.java b/Mage.Sets/src/mage/cards/a/ArcticAven.java index a4a43b06688..8cee410fd3a 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticAven.java +++ b/Mage.Sets/src/mage/cards/a/ArcticAven.java @@ -27,10 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,9 +37,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArcticFlats.java b/Mage.Sets/src/mage/cards/a/ArcticFlats.java index ec02252959e..bbd4a8a96ae 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticFlats.java +++ b/Mage.Sets/src/mage/cards/a/ArcticFlats.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +45,7 @@ public class ArcticFlats extends CardImpl { public ArcticFlats(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Snow"); + this.addSuperType(SuperType.SNOW); // Arctic Flats enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/a/ArcticMerfolk.java b/Mage.Sets/src/mage/cards/a/ArcticMerfolk.java index 37e2e900646..8913146ae57 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticMerfolk.java +++ b/Mage.Sets/src/mage/cards/a/ArcticMerfolk.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCondition; @@ -37,10 +35,13 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArcticWolves.java b/Mage.Sets/src/mage/cards/a/ArcticWolves.java index 4b079b13d7f..a183301c9af 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticWolves.java +++ b/Mage.Sets/src/mage/cards/a/ArcticWolves.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ArcumDagsson.java b/Mage.Sets/src/mage/cards/a/ArcumDagsson.java index 9944304e014..10d3e864b8d 100644 --- a/Mage.Sets/src/mage/cards/a/ArcumDagsson.java +++ b/Mage.Sets/src/mage/cards/a/ArcumDagsson.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; @@ -51,6 +51,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author emerald000 @@ -65,7 +67,7 @@ public class ArcumDagsson extends CardImpl { public ArcumDagsson(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArdentMilitia.java b/Mage.Sets/src/mage/cards/a/ArdentMilitia.java index 2621d573776..87abb2ce48d 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentMilitia.java +++ b/Mage.Sets/src/mage/cards/a/ArdentMilitia.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArdentPlea.java b/Mage.Sets/src/mage/cards/a/ArdentPlea.java index 3375ffb2e03..51d639e5571 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentPlea.java +++ b/Mage.Sets/src/mage/cards/a/ArdentPlea.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.keyword.CascadeAbility; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArdentRecruit.java b/Mage.Sets/src/mage/cards/a/ArdentRecruit.java index 55306054ae8..3a52cebc731 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentRecruit.java +++ b/Mage.Sets/src/mage/cards/a/ArdentRecruit.java @@ -28,11 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +38,11 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArdentSoldier.java b/Mage.Sets/src/mage/cards/a/ArdentSoldier.java index e1da72f29a2..22b56a34d58 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentSoldier.java +++ b/Mage.Sets/src/mage/cards/a/ArdentSoldier.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCondition; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/Arena.java b/Mage.Sets/src/mage/cards/a/Arena.java index 9bbd8eeef01..231c96581e5 100644 --- a/Mage.Sets/src/mage/cards/a/Arena.java +++ b/Mage.Sets/src/mage/cards/a/Arena.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponentsChoicePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/ArenaAthlete.java b/Mage.Sets/src/mage/cards/a/ArenaAthlete.java index 5429709c2cf..d76929c59ff 100644 --- a/Mage.Sets/src/mage/cards/a/ArenaAthlete.java +++ b/Mage.Sets/src/mage/cards/a/ArenaAthlete.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.combat.CantBlockTargetEffect; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java b/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java index 044a6bc7793..7877964a6ac 100644 --- a/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java +++ b/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java @@ -5,7 +5,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -20,6 +19,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author nickmyers diff --git a/Mage.Sets/src/mage/cards/a/ArensonsAura.java b/Mage.Sets/src/mage/cards/a/ArensonsAura.java index edd61a1c566..c41a352a883 100644 --- a/Mage.Sets/src/mage/cards/a/ArensonsAura.java +++ b/Mage.Sets/src/mage/cards/a/ArensonsAura.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -45,6 +44,8 @@ import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ArgentMutation.java b/Mage.Sets/src/mage/cards/a/ArgentMutation.java index f8936fd7b0b..c534272bc5c 100644 --- a/Mage.Sets/src/mage/cards/a/ArgentMutation.java +++ b/Mage.Sets/src/mage/cards/a/ArgentMutation.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.AddCardTypeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArgentSphinx.java b/Mage.Sets/src/mage/cards/a/ArgentSphinx.java index 1e0b8ac2f81..ea111f1cd67 100644 --- a/Mage.Sets/src/mage/cards/a/ArgentSphinx.java +++ b/Mage.Sets/src/mage/cards/a/ArgentSphinx.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArgentumArmor.java b/Mage.Sets/src/mage/cards/a/ArgentumArmor.java index b31c37db847..ecdff5822c4 100644 --- a/Mage.Sets/src/mage/cards/a/ArgentumArmor.java +++ b/Mage.Sets/src/mage/cards/a/ArgentumArmor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArgivianArchaeologist.java b/Mage.Sets/src/mage/cards/a/ArgivianArchaeologist.java index 2fd988e575a..b9d4b060147 100644 --- a/Mage.Sets/src/mage/cards/a/ArgivianArchaeologist.java +++ b/Mage.Sets/src/mage/cards/a/ArgivianArchaeologist.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterArtifactCard; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java b/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java index 88e9921f0db..3e501354404 100644 --- a/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java +++ b/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArgivianFind.java b/Mage.Sets/src/mage/cards/a/ArgivianFind.java index 2b9a53a36d2..b9184b72cb6 100644 --- a/Mage.Sets/src/mage/cards/a/ArgivianFind.java +++ b/Mage.Sets/src/mage/cards/a/ArgivianFind.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/ArgivianRestoration.java b/Mage.Sets/src/mage/cards/a/ArgivianRestoration.java index 1bcbd85d944..d1067bc8c5f 100644 --- a/Mage.Sets/src/mage/cards/a/ArgivianRestoration.java +++ b/Mage.Sets/src/mage/cards/a/ArgivianRestoration.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArgothianElder.java b/Mage.Sets/src/mage/cards/a/ArgothianElder.java index bcc36d505a4..36e09e7228a 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianElder.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianElder.java @@ -29,9 +29,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,12 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/ArgothianEnchantress.java b/Mage.Sets/src/mage/cards/a/ArgothianEnchantress.java index 4e65ce64090..9d9ff416bec 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianEnchantress.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianEnchantress.java @@ -27,17 +27,18 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/ArgothianPixies.java b/Mage.Sets/src/mage/cards/a/ArgothianPixies.java index 042def27f46..9e79a630fe8 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianPixies.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianPixies.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleEvasionAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/a/ArgothianSwine.java b/Mage.Sets/src/mage/cards/a/ArgothianSwine.java index 498cdbd2a42..cc00b887048 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianSwine.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianSwine.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java b/Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java index 116be4964b6..16d08609fb2 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/a/ArgothianWurm.java b/Mage.Sets/src/mage/cards/a/ArgothianWurm.java index 21ab3059bff..ea1d3e38217 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianWurm.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianWurm.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AridMesa.java b/Mage.Sets/src/mage/cards/a/AridMesa.java index 55a6e6045f4..83d03045b3b 100644 --- a/Mage.Sets/src/mage/cards/a/AridMesa.java +++ b/Mage.Sets/src/mage/cards/a/AridMesa.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; -import mage.constants.CardType; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArjunTheShiftingFlame.java b/Mage.Sets/src/mage/cards/a/ArjunTheShiftingFlame.java index 7036ebc8a74..0e3fea72e3e 100644 --- a/Mage.Sets/src/mage/cards/a/ArjunTheShiftingFlame.java +++ b/Mage.Sets/src/mage/cards/a/ArjunTheShiftingFlame.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -37,9 +36,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes @@ -48,7 +50,7 @@ public class ArjunTheShiftingFlame extends CardImpl { public ArjunTheShiftingFlame(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Sphinx"); this.subtype.add("Wizard"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArkOfBlight.java b/Mage.Sets/src/mage/cards/a/ArkOfBlight.java index 319fb777071..b30aec1c04d 100644 --- a/Mage.Sets/src/mage/cards/a/ArkOfBlight.java +++ b/Mage.Sets/src/mage/cards/a/ArkOfBlight.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java b/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java index 3f47888a3f0..74354be76a9 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -54,6 +53,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.command.Emblem; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArlinnKord.java b/Mage.Sets/src/mage/cards/a/ArlinnKord.java index 2b16d2c423c..8e3b142dd27 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnKord.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnKord.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.game.permanent.token.WolfToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArmWithAether.java b/Mage.Sets/src/mage/cards/a/ArmWithAether.java index 0b222861789..8201d0ce080 100644 --- a/Mage.Sets/src/mage/cards/a/ArmWithAether.java +++ b/Mage.Sets/src/mage/cards/a/ArmWithAether.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnToHandTargetEffect; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArmadaWurm.java b/Mage.Sets/src/mage/cards/a/ArmadaWurm.java index 2b2a8b51d96..544a9402c2d 100644 --- a/Mage.Sets/src/mage/cards/a/ArmadaWurm.java +++ b/Mage.Sets/src/mage/cards/a/ArmadaWurm.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.WurmToken2; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java index 2ef993a1206..423b4fb8f3c 100644 --- a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java +++ b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DealsDamageAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,14 +40,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Armageddon.java b/Mage.Sets/src/mage/cards/a/Armageddon.java index 1e023d8cff1..01783d32168 100644 --- a/Mage.Sets/src/mage/cards/a/Armageddon.java +++ b/Mage.Sets/src/mage/cards/a/Armageddon.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArmageddonClock.java b/Mage.Sets/src/mage/cards/a/ArmageddonClock.java index ae0a1b71df8..78a8f65f816 100644 --- a/Mage.Sets/src/mage/cards/a/ArmageddonClock.java +++ b/Mage.Sets/src/mage/cards/a/ArmageddonClock.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -37,16 +36,14 @@ import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.DamagePlayersEffect; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.counters.CounterType; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.*; +import mage.counters.CounterType; + +import java.util.UUID; /** diff --git a/Mage.Sets/src/mage/cards/a/ArmamentCorps.java b/Mage.Sets/src/mage/cards/a/ArmamentCorps.java index f395eb42a53..ee157350a70 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentCorps.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentCorps.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java index b5bc94bcae3..45ef3f245bb 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java @@ -27,18 +27,13 @@ */ package mage.cards.a; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java index 5e25e09273f..7ef7f0c9fd6 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; @@ -43,16 +42,14 @@ import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArmedDangerous.java b/Mage.Sets/src/mage/cards/a/ArmedDangerous.java index c36fde9c006..7b6dcf3af85 100644 --- a/Mage.Sets/src/mage/cards/a/ArmedDangerous.java +++ b/Mage.Sets/src/mage/cards/a/ArmedDangerous.java @@ -28,17 +28,18 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.combat.MustBeBlockedByAllTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardSetInfo; import mage.cards.SplitCard; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java b/Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java index 7e26cfb4e00..8c2fab1e0bc 100644 --- a/Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java +++ b/Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/ArmedResponse.java b/Mage.Sets/src/mage/cards/a/ArmedResponse.java index 440b2eb6b37..1afba191ddc 100644 --- a/Mage.Sets/src/mage/cards/a/ArmedResponse.java +++ b/Mage.Sets/src/mage/cards/a/ArmedResponse.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -38,6 +37,8 @@ import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/ArmillarySphere.java b/Mage.Sets/src/mage/cards/a/ArmillarySphere.java index fd25264d257..b5ded346b47 100644 --- a/Mage.Sets/src/mage/cards/a/ArmillarySphere.java +++ b/Mage.Sets/src/mage/cards/a/ArmillarySphere.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/Armistice.java b/Mage.Sets/src/mage/cards/a/Armistice.java index 753427048ce..baa772ee86a 100644 --- a/Mage.Sets/src/mage/cards/a/Armistice.java +++ b/Mage.Sets/src/mage/cards/a/Armistice.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java index 768b9e0a550..0326ff22bfa 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java index b2c3c8697fc..8e4155ea881 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SacrificeIfCastAtInstantTimeTriggeredAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ArmorSliver.java b/Mage.Sets/src/mage/cards/a/ArmorSliver.java index c836d8af656..7bf8d5a54a3 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorSliver.java +++ b/Mage.Sets/src/mage/cards/a/ArmorSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArmorThrull.java b/Mage.Sets/src/mage/cards/a/ArmorThrull.java index f6024162a6b..dc489d149e6 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorThrull.java +++ b/Mage.Sets/src/mage/cards/a/ArmorThrull.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java b/Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java index f62abcad375..a5ea58cdfff 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java +++ b/Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -39,6 +38,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java index a9d0f425440..faf7d9b04cc 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java @@ -27,13 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; @@ -43,12 +36,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com, North diff --git a/Mage.Sets/src/mage/cards/a/ArmoredCancrix.java b/Mage.Sets/src/mage/cards/a/ArmoredCancrix.java index b790cfbdb53..a32a85050a8 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredCancrix.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredCancrix.java @@ -28,11 +28,12 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java b/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java index e5525b65d8d..28415e942d0 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGriffin.java b/Mage.Sets/src/mage/cards/a/ArmoredGriffin.java index 2bfdf54239e..3737363e2c8 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGriffin.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGriffin.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java b/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java index 3bbbc80c10a..2f91dc45ad2 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/ArmoredPegasus.java b/Mage.Sets/src/mage/cards/a/ArmoredPegasus.java index b5d9d70af79..3cfb342e5e7 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredPegasus.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredPegasus.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArmoredSkaab.java b/Mage.Sets/src/mage/cards/a/ArmoredSkaab.java index cef3b3b2a68..d063469dddc 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredSkaab.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredSkaab.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArmoredTransport.java b/Mage.Sets/src/mage/cards/a/ArmoredTransport.java index defccb61ffa..fc9122c7e64 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredTransport.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredTransport.java @@ -27,22 +27,22 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java b/Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java index 68a8ced69ef..22838750964 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java @@ -28,12 +28,12 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java b/Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java index c7826062d56..fa1d84a881a 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java @@ -28,11 +28,12 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java b/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java index d01472d4940..c02fb166697 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java +++ b/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java b/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java index a689074b5c1..8f2b5fc5377 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java index 498adcb2eac..eb3a9ec325d 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java b/Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java index eecae74f24e..a061f6b91d5 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.AttacksAttachedTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersAttachedEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArmsDealer.java b/Mage.Sets/src/mage/cards/a/ArmsDealer.java index 0c4958260ac..47ddc230eed 100644 --- a/Mage.Sets/src/mage/cards/a/ArmsDealer.java +++ b/Mage.Sets/src/mage/cards/a/ArmsDealer.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,11 +34,15 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArmyAnts.java b/Mage.Sets/src/mage/cards/a/ArmyAnts.java index 11000911bab..2dabe8fb864 100644 --- a/Mage.Sets/src/mage/cards/a/ArmyAnts.java +++ b/Mage.Sets/src/mage/cards/a/ArmyAnts.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArmyOfAllah.java b/Mage.Sets/src/mage/cards/a/ArmyOfAllah.java index 29843672abd..aa7bca20caf 100644 --- a/Mage.Sets/src/mage/cards/a/ArmyOfAllah.java +++ b/Mage.Sets/src/mage/cards/a/ArmyOfAllah.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArmyOfTheDamned.java b/Mage.Sets/src/mage/cards/a/ArmyOfTheDamned.java index 70a2fb55443..25630528924 100644 --- a/Mage.Sets/src/mage/cards/a/ArmyOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/a/ArmyOfTheDamned.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java b/Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java index 5c9d0a39e42..139210fb5ae 100644 --- a/Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java +++ b/Mage.Sets/src/mage/cards/a/ArnjlotsAscent.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/Arrest.java b/Mage.Sets/src/mage/cards/a/Arrest.java index c911ef72cd6..ec47b9a7c02 100644 --- a/Mage.Sets/src/mage/cards/a/Arrest.java +++ b/Mage.Sets/src/mage/cards/a/Arrest.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -39,10 +35,14 @@ import mage.abilities.effects.common.combat.CantBlockAttackActivateAttachedEffec import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java b/Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java index c871c7f3536..c6d2d55ce9b 100644 --- a/Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java +++ b/Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -45,6 +43,9 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.Objects; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/ArrogantVampire.java b/Mage.Sets/src/mage/cards/a/ArrogantVampire.java index ac5512f8fce..6241d0ccd00 100644 --- a/Mage.Sets/src/mage/cards/a/ArrogantVampire.java +++ b/Mage.Sets/src/mage/cards/a/ArrogantVampire.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/ArrogantWurm.java b/Mage.Sets/src/mage/cards/a/ArrogantWurm.java index 39519b7813d..bfe589cf651 100644 --- a/Mage.Sets/src/mage/cards/a/ArrogantWurm.java +++ b/Mage.Sets/src/mage/cards/a/ArrogantWurm.java @@ -27,13 +27,13 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MadnessAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/ArrowStorm.java b/Mage.Sets/src/mage/cards/a/ArrowStorm.java index 4783ceb2552..60970a1aaf5 100644 --- a/Mage.Sets/src/mage/cards/a/ArrowStorm.java +++ b/Mage.Sets/src/mage/cards/a/ArrowStorm.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.RaidCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.PlayerAttackedWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java b/Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java index b21376b4f0a..f0f22d13bc6 100644 --- a/Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java +++ b/Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; @@ -40,6 +39,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.game.Game; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * @author LevelX2 */ diff --git a/Mage.Sets/src/mage/cards/a/ArrowsOfJustice.java b/Mage.Sets/src/mage/cards/a/ArrowsOfJustice.java index e9908b687b0..37d0d9ef211 100644 --- a/Mage.Sets/src/mage/cards/a/ArrowsOfJustice.java +++ b/Mage.Sets/src/mage/cards/a/ArrowsOfJustice.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArsenalThresher.java b/Mage.Sets/src/mage/cards/a/ArsenalThresher.java index e42500465a1..e89e0134840 100644 --- a/Mage.Sets/src/mage/cards/a/ArsenalThresher.java +++ b/Mage.Sets/src/mage/cards/a/ArsenalThresher.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/ArtfulDodge.java b/Mage.Sets/src/mage/cards/a/ArtfulDodge.java index c546f897d06..c05b3a665c3 100644 --- a/Mage.Sets/src/mage/cards/a/ArtfulDodge.java +++ b/Mage.Sets/src/mage/cards/a/ArtfulDodge.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArtfulManeuver.java b/Mage.Sets/src/mage/cards/a/ArtfulManeuver.java index 7c6dcf5abb8..17bfedde2f3 100644 --- a/Mage.Sets/src/mage/cards/a/ArtfulManeuver.java +++ b/Mage.Sets/src/mage/cards/a/ArtfulManeuver.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArtifactBlast.java b/Mage.Sets/src/mage/cards/a/ArtifactBlast.java index eda60ce1d7f..372ebd6dece 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactBlast.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactBlast.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.TargetSpell; import mage.filter.common.FilterArtifactSpell; +import mage.target.TargetSpell; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/ArtifactMutation.java b/Mage.Sets/src/mage/cards/a/ArtifactMutation.java index b61d2e88a42..c62bd06a6b3 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactMutation.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactMutation.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArtifactPossession.java b/Mage.Sets/src/mage/cards/a/ArtifactPossession.java index f45e304ab9c..c8e10e79aa5 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactPossession.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactPossession.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/a/ArtifactWard.java b/Mage.Sets/src/mage/cards/a/ArtifactWard.java index 5c59207e7bb..cfc268c738a 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactWard.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactWard.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -43,6 +42,8 @@ import mage.filter.common.FilterArtifactCard; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/a/ArtificersEpiphany.java b/Mage.Sets/src/mage/cards/a/ArtificersEpiphany.java index 2154a8a5a82..a1733147458 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificersEpiphany.java +++ b/Mage.Sets/src/mage/cards/a/ArtificersEpiphany.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -40,6 +38,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/ArtificersHex.java b/Mage.Sets/src/mage/cards/a/ArtificersHex.java index aab8f7d0d06..a2aa387e6ce 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificersHex.java +++ b/Mage.Sets/src/mage/cards/a/ArtificersHex.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java b/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java index 2709172a5bb..0aeb30087d1 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java +++ b/Mage.Sets/src/mage/cards/a/ArtificersIntuition.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -42,6 +41,8 @@ import mage.filter.common.FilterArtifactCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/Artillerize.java b/Mage.Sets/src/mage/cards/a/Artillerize.java index be3de49bcfc..f114bf752fb 100644 --- a/Mage.Sets/src/mage/cards/a/Artillerize.java +++ b/Mage.Sets/src/mage/cards/a/Artillerize.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/ArtisanOfForms.java b/Mage.Sets/src/mage/cards/a/ArtisanOfForms.java index 664c7a2803f..7520507587c 100644 --- a/Mage.Sets/src/mage/cards/a/ArtisanOfForms.java +++ b/Mage.Sets/src/mage/cards/a/ArtisanOfForms.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.util.functions.ApplyToPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java b/Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java index ee06259450d..eca14631053 100644 --- a/Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java +++ b/Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java @@ -28,8 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.CastSourceTriggeredAbility; @@ -37,9 +35,12 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.abilities.keyword.AnnihilatorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/ArtisansSorrow.java b/Mage.Sets/src/mage/cards/a/ArtisansSorrow.java index c531f3b2deb..172a1df9a07 100644 --- a/Mage.Sets/src/mage/cards/a/ArtisansSorrow.java +++ b/Mage.Sets/src/mage/cards/a/ArtisansSorrow.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AsajjVentress.java b/Mage.Sets/src/mage/cards/a/AsajjVentress.java index e156023c609..99cb57c37fe 100644 --- a/Mage.Sets/src/mage/cards/a/AsajjVentress.java +++ b/Mage.Sets/src/mage/cards/a/AsajjVentress.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -44,9 +42,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.target.common.TargetCreaturePermanent; import mage.watchers.common.LifeLossOtherFromCombatWatcher; +import java.util.UUID; + /** * @author Styxo */ @@ -54,7 +55,7 @@ public class AsajjVentress extends CardImpl { public AsajjVentress(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{B}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Dathomirian"); this.subtype.add("Sith"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AscendantEvincar.java b/Mage.Sets/src/mage/cards/a/AscendantEvincar.java index 5f47bdbc962..d94a7965573 100644 --- a/Mage.Sets/src/mage/cards/a/AscendantEvincar.java +++ b/Mage.Sets/src/mage/cards/a/AscendantEvincar.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -37,12 +34,16 @@ import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Loki @@ -59,7 +60,7 @@ public class AscendantEvincar extends CardImpl { public AscendantEvincar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AscendedLawmage.java b/Mage.Sets/src/mage/cards/a/AscendedLawmage.java index cb84316478f..02531778d81 100644 --- a/Mage.Sets/src/mage/cards/a/AscendedLawmage.java +++ b/Mage.Sets/src/mage/cards/a/AscendedLawmage.java @@ -28,13 +28,14 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AscendingAven.java b/Mage.Sets/src/mage/cards/a/AscendingAven.java index 3df9f52888a..eab5c9ed03a 100644 --- a/Mage.Sets/src/mage/cards/a/AscendingAven.java +++ b/Mage.Sets/src/mage/cards/a/AscendingAven.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/Asceticism.java b/Mage.Sets/src/mage/cards/a/Asceticism.java index d333bb95dbd..e2294f11c69 100644 --- a/Mage.Sets/src/mage/cards/a/Asceticism.java +++ b/Mage.Sets/src/mage/cards/a/Asceticism.java @@ -28,7 +28,6 @@ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author ayratn */ diff --git a/Mage.Sets/src/mage/cards/a/AshBarrens.java b/Mage.Sets/src/mage/cards/a/AshBarrens.java index 52514aa5618..98589e4173a 100644 --- a/Mage.Sets/src/mage/cards/a/AshBarrens.java +++ b/Mage.Sets/src/mage/cards/a/AshBarrens.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.BasicLandcyclingAbility; import mage.abilities.mana.ColorlessManaAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/a/AshZealot.java b/Mage.Sets/src/mage/cards/a/AshZealot.java index 3fc65c0f8c0..4932895583b 100644 --- a/Mage.Sets/src/mage/cards/a/AshZealot.java +++ b/Mage.Sets/src/mage/cards/a/AshZealot.java @@ -28,7 +28,6 @@ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/a/AshasFavor.java b/Mage.Sets/src/mage/cards/a/AshasFavor.java index c1fabd81cee..e9fe80e8c4a 100644 --- a/Mage.Sets/src/mage/cards/a/AshasFavor.java +++ b/Mage.Sets/src/mage/cards/a/AshasFavor.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,9 +38,15 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java index b2548e98734..29d6cf022fb 100644 --- a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java +++ b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -48,6 +47,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AshcoatBear.java b/Mage.Sets/src/mage/cards/a/AshcoatBear.java index 8d00fa8c415..75cccc0ffb1 100644 --- a/Mage.Sets/src/mage/cards/a/AshcoatBear.java +++ b/Mage.Sets/src/mage/cards/a/AshcoatBear.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AshenFirebeast.java b/Mage.Sets/src/mage/cards/a/AshenFirebeast.java index 2cb79e9ea7e..b611905e20b 100644 --- a/Mage.Sets/src/mage/cards/a/AshenFirebeast.java +++ b/Mage.Sets/src/mage/cards/a/AshenFirebeast.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java b/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java index ed2087e029e..fe7579ff314 100644 --- a/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java +++ b/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AshenPowder.java b/Mage.Sets/src/mage/cards/a/AshenPowder.java index 3d976e6993d..685c02e98c1 100644 --- a/Mage.Sets/src/mage/cards/a/AshenPowder.java +++ b/Mage.Sets/src/mage/cards/a/AshenPowder.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInOpponentsGraveyard; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AshenRider.java b/Mage.Sets/src/mage/cards/a/AshenRider.java index db61248878f..48ec6b47a27 100644 --- a/Mage.Sets/src/mage/cards/a/AshenRider.java +++ b/Mage.Sets/src/mage/cards/a/AshenRider.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldOrDiesSourceTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java b/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java index 940bfa065ce..87763397c91 100644 --- a/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java @@ -28,19 +28,19 @@ package mage.cards.a; -import java.util.UUID; - -import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetOpponent; import mage.watchers.common.ZuberasDiedWatcher; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java index daa4c0fa2e1..f35b29f5698 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.MageInt; import mage.ObjectColor; import mage.abilities.CountType; @@ -46,6 +44,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * @author jeffwadsworth */ diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorGouger.java b/Mage.Sets/src/mage/cards/a/AshenmoorGouger.java index d69daafb0a5..7d0f7e58dfa 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorGouger.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorGouger.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java b/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java index b328a9abe7a..39cc4dddf31 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java b/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java index e848f607cc4..f7ec438a27a 100644 --- a/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java +++ b/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -36,16 +35,13 @@ import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AshesToAshes.java b/Mage.Sets/src/mage/cards/a/AshesToAshes.java index a9d273b6a1e..731d6a058c1 100644 --- a/Mage.Sets/src/mage/cards/a/AshesToAshes.java +++ b/Mage.Sets/src/mage/cards/a/AshesToAshes.java @@ -27,14 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -43,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java b/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java index 2afa494120d..5a893b3de25 100644 --- a/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java +++ b/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -36,17 +35,8 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.common.PayVariableLoyaltyCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; @@ -60,6 +50,8 @@ import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AshioksAdept.java b/Mage.Sets/src/mage/cards/a/AshioksAdept.java index d856f1c15a2..da6d55e27ce 100644 --- a/Mage.Sets/src/mage/cards/a/AshioksAdept.java +++ b/Mage.Sets/src/mage/cards/a/AshioksAdept.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.HeroicAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java index 12216dcbebb..496d03eb2d0 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java +++ b/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java @@ -27,13 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -44,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -52,7 +54,7 @@ public class AshlingTheExtinguisher extends CardImpl { public AshlingTheExtinguisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java b/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java index 1d19449d107..d930dc22a7f 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java +++ b/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -55,7 +56,7 @@ public class AshlingThePilgrim extends CardImpl { public AshlingThePilgrim(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java b/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java index d7d1155f02a..708a73fc6ff 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java +++ b/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Eirkei diff --git a/Mage.Sets/src/mage/cards/a/AshmouthBlade.java b/Mage.Sets/src/mage/cards/a/AshmouthBlade.java index 425850b24fd..dc9402c9e22 100644 --- a/Mage.Sets/src/mage/cards/a/AshmouthBlade.java +++ b/Mage.Sets/src/mage/cards/a/AshmouthBlade.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AshmouthHound.java b/Mage.Sets/src/mage/cards/a/AshmouthHound.java index 3b70d17472f..51f6a2145e9 100644 --- a/Mage.Sets/src/mage/cards/a/AshmouthHound.java +++ b/Mage.Sets/src/mage/cards/a/AshmouthHound.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AshnodsAltar.java b/Mage.Sets/src/mage/cards/a/AshnodsAltar.java index f510471c8eb..b0de79ba54c 100644 --- a/Mage.Sets/src/mage/cards/a/AshnodsAltar.java +++ b/Mage.Sets/src/mage/cards/a/AshnodsAltar.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.Mana; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.mana.SimpleManaAbility; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java b/Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java index b2689e741ad..7203ca5e92a 100644 --- a/Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java +++ b/Mage.Sets/src/mage/cards/a/AshnodsBattleGear.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SkipUntapOptionalAbility; @@ -44,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author LoneFox */ diff --git a/Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java b/Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java index d75cdec650b..5821e4274ff 100644 --- a/Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java +++ b/Mage.Sets/src/mage/cards/a/AshnodsTransmogrant.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -46,6 +45,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java b/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java index 52d9813f257..e568a74a9a8 100644 --- a/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java +++ b/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -40,16 +38,15 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.TargetController; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.watchers.Watcher; +import java.util.UUID; + /** * @author Plopman */ @@ -57,7 +54,7 @@ public class AsmiraHolyAvenger extends CardImpl { public AsmiraHolyAvenger(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java index f59e107672b..df9c8d6aca2 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -38,14 +37,12 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AspectOfHydra.java b/Mage.Sets/src/mage/cards/a/AspectOfHydra.java index 9351b4003d7..515ac9c98e6 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfHydra.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.DevotionCount; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java index 713641e9eb5..a146bab10b6 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AspectOfWolf.java b/Mage.Sets/src/mage/cards/a/AspectOfWolf.java index 861a2b15d6b..7c148f12e9f 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfWolf.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfWolf.java @@ -36,7 +36,10 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java b/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java index 3e2b79df64e..9bbf6d0f7bf 100644 --- a/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java +++ b/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Asphyxiate.java b/Mage.Sets/src/mage/cards/a/Asphyxiate.java index 532e7268282..1f5e7d7badf 100644 --- a/Mage.Sets/src/mage/cards/a/Asphyxiate.java +++ b/Mage.Sets/src/mage/cards/a/Asphyxiate.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java b/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java index 33104f50393..4ab450e4ba9 100644 --- a/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java +++ b/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ThopterColorlessToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Assassinate.java b/Mage.Sets/src/mage/cards/a/Assassinate.java index f05d22cefb9..b01033d3110 100644 --- a/Mage.Sets/src/mage/cards/a/Assassinate.java +++ b/Mage.Sets/src/mage/cards/a/Assassinate.java @@ -28,15 +28,16 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AssassinsStrike.java b/Mage.Sets/src/mage/cards/a/AssassinsStrike.java index 37924a1a731..fcc2c127943 100644 --- a/Mage.Sets/src/mage/cards/a/AssassinsStrike.java +++ b/Mage.Sets/src/mage/cards/a/AssassinsStrike.java @@ -27,14 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; @@ -42,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AssaultBattery.java b/Mage.Sets/src/mage/cards/a/AssaultBattery.java index db659e34837..09adaa9431c 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultBattery.java +++ b/Mage.Sets/src/mage/cards/a/AssaultBattery.java @@ -28,16 +28,17 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardSetInfo; import mage.cards.SplitCard; +import mage.constants.CardType; import mage.game.permanent.token.ElephantToken; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AssaultFormation.java b/Mage.Sets/src/mage/cards/a/AssaultFormation.java index 17f524d87d9..09470ba2a93 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultFormation.java +++ b/Mage.Sets/src/mage/cards/a/AssaultFormation.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,18 +37,15 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AssaultGriffin.java b/Mage.Sets/src/mage/cards/a/AssaultGriffin.java index 7f0627ad05d..14a3c17ee27 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultGriffin.java +++ b/Mage.Sets/src/mage/cards/a/AssaultGriffin.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AssaultStrobe.java b/Mage.Sets/src/mage/cards/a/AssaultStrobe.java index f9521ce7d14..ac0237f92e7 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultStrobe.java +++ b/Mage.Sets/src/mage/cards/a/AssaultStrobe.java @@ -28,12 +28,12 @@ package mage.cards.a; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AssaultSuit.java b/Mage.Sets/src/mage/cards/a/AssaultSuit.java index d2c1c1c631c..79db858e7bc 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultSuit.java +++ b/Mage.Sets/src/mage/cards/a/AssaultSuit.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,18 +43,15 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AssaultZeppelid.java b/Mage.Sets/src/mage/cards/a/AssaultZeppelid.java index 3825b55cfe7..ab3791b9fba 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultZeppelid.java +++ b/Mage.Sets/src/mage/cards/a/AssaultZeppelid.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AssembleTheLegion.java b/Mage.Sets/src/mage/cards/a/AssembleTheLegion.java index 1959da33e47..c26ce6d39da 100644 --- a/Mage.Sets/src/mage/cards/a/AssembleTheLegion.java +++ b/Mage.Sets/src/mage/cards/a/AssembleTheLegion.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; @@ -40,6 +39,8 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.permanent.token.SoldierTokenWithHaste; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AssembledAlphas.java b/Mage.Sets/src/mage/cards/a/AssembledAlphas.java index 80025eda5fd..42528e32b7c 100644 --- a/Mage.Sets/src/mage/cards/a/AssembledAlphas.java +++ b/Mage.Sets/src/mage/cards/a/AssembledAlphas.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AssemblyWorker.java b/Mage.Sets/src/mage/cards/a/AssemblyWorker.java index d1ae7ae4e40..591d7d26d80 100644 --- a/Mage.Sets/src/mage/cards/a/AssemblyWorker.java +++ b/Mage.Sets/src/mage/cards/a/AssemblyWorker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AssertAuthority.java b/Mage.Sets/src/mage/cards/a/AssertAuthority.java index 63f3097e84c..127bc994fc6 100644 --- a/Mage.Sets/src/mage/cards/a/AssertAuthority.java +++ b/Mage.Sets/src/mage/cards/a/AssertAuthority.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AstralCornucopia.java b/Mage.Sets/src/mage/cards/a/AstralCornucopia.java index e2e110e9220..77e41476223 100644 --- a/Mage.Sets/src/mage/cards/a/AstralCornucopia.java +++ b/Mage.Sets/src/mage/cards/a/AstralCornucopia.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.List; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -46,6 +44,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AstralSlide.java b/Mage.Sets/src/mage/cards/a/AstralSlide.java index db23956a8f6..93b8fbdf2c3 100644 --- a/Mage.Sets/src/mage/cards/a/AstralSlide.java +++ b/Mage.Sets/src/mage/cards/a/AstralSlide.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.CycleAllTriggeredAbility; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AstralSteel.java b/Mage.Sets/src/mage/cards/a/AstralSteel.java index e2ff32ec22f..9b4e18da9cb 100644 --- a/Mage.Sets/src/mage/cards/a/AstralSteel.java +++ b/Mage.Sets/src/mage/cards/a/AstralSteel.java @@ -27,16 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/Astrolabe.java b/Mage.Sets/src/mage/cards/a/Astrolabe.java index 31e4cec7be8..238aa4d6e01 100644 --- a/Mage.Sets/src/mage/cards/a/Astrolabe.java +++ b/Mage.Sets/src/mage/cards/a/Astrolabe.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AsylumVisitor.java b/Mage.Sets/src/mage/cards/a/AsylumVisitor.java index a98b97c2ac6..dcf465bc6a1 100644 --- a/Mage.Sets/src/mage/cards/a/AsylumVisitor.java +++ b/Mage.Sets/src/mage/cards/a/AsylumVisitor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -44,6 +43,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java b/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java index e330d44467f..448585cd7a6 100644 --- a/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java +++ b/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -43,10 +42,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterMana; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author spjspj @@ -62,7 +64,7 @@ public class AtalyaSamiteMaster extends CardImpl { public AtalyaSamiteMaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java b/Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java index 619e5b3c61e..15f9fd28951 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java index d4753ecccb9..00960108699 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java b/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java index 6679f0442ad..30d34ce1b87 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -37,14 +36,12 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java b/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java index aba69560dc7..a9c52bd851f 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,6 +47,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -55,7 +57,7 @@ public class AtarkaWorldRender extends CardImpl { public AtarkaWorldRender(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AtarkasCommand.java b/Mage.Sets/src/mage/cards/a/AtarkasCommand.java index c9e04b5576d..308aaffbd04 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkasCommand.java +++ b/Mage.Sets/src/mage/cards/a/AtarkasCommand.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamagePlayersEffect; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java index 7acc93f8e1d..ffcb86a595c 100644 --- a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java +++ b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -41,11 +40,7 @@ import mage.abilities.effects.common.continuous.LoseCreatureTypeSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -57,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 @@ -72,7 +69,7 @@ public class AthreosGodOfPassage extends CardImpl { public AthreosGodOfPassage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{1}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/Atog.java b/Mage.Sets/src/mage/cards/a/Atog.java index 5b15ca031e2..dfdf7748979 100644 --- a/Mage.Sets/src/mage/cards/a/Atog.java +++ b/Mage.Sets/src/mage/cards/a/Atog.java @@ -27,21 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/Atogatog.java b/Mage.Sets/src/mage/cards/a/Atogatog.java index e8731b2c45d..68bed27c6c3 100644 --- a/Mage.Sets/src/mage/cards/a/Atogatog.java +++ b/Mage.Sets/src/mage/cards/a/Atogatog.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -36,15 +35,14 @@ import mage.abilities.dynamicvalue.common.SacrificeCostCreaturesPower; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +58,7 @@ public class Atogatog extends CardImpl { public Atogatog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Atog"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java b/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java index f2eebe26a62..00ffd5fdb9b 100644 --- a/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java +++ b/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; @@ -38,8 +37,11 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes @@ -49,7 +51,7 @@ public class AtraxaPraetorsVoice extends CardImpl { public AtraxaPraetorsVoice(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.subtype.add("Horror"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AttendedKnight.java b/Mage.Sets/src/mage/cards/a/AttendedKnight.java index 0729a69b5bd..bc2d3b6556e 100644 --- a/Mage.Sets/src/mage/cards/a/AttendedKnight.java +++ b/Mage.Sets/src/mage/cards/a/AttendedKnight.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.SoldierToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/Attrition.java b/Mage.Sets/src/mage/cards/a/Attrition.java index ad6c4d5f32e..277d720e2da 100644 --- a/Mage.Sets/src/mage/cards/a/Attrition.java +++ b/Mage.Sets/src/mage/cards/a/Attrition.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,12 +34,16 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AttuneWithAether.java b/Mage.Sets/src/mage/cards/a/AttuneWithAether.java index be4e985fc63..978b0af93de 100644 --- a/Mage.Sets/src/mage/cards/a/AttuneWithAether.java +++ b/Mage.Sets/src/mage/cards/a/AttuneWithAether.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Attunement.java b/Mage.Sets/src/mage/cards/a/Attunement.java index 5367df598e9..1e8ece0d65c 100644 --- a/Mage.Sets/src/mage/cards/a/Attunement.java +++ b/Mage.Sets/src/mage/cards/a/Attunement.java @@ -27,15 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandFromBattlefieldSourceCost; -import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java b/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java index 690ce140679..8c919cfa388 100644 --- a/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java +++ b/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AugerSpree.java b/Mage.Sets/src/mage/cards/a/AugerSpree.java index 65840f7c275..e9fa153e072 100644 --- a/Mage.Sets/src/mage/cards/a/AugerSpree.java +++ b/Mage.Sets/src/mage/cards/a/AugerSpree.java @@ -27,10 +27,10 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java b/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java index 957c3a75619..b68fab8a51c 100644 --- a/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AugurIlVec.java b/Mage.Sets/src/mage/cards/a/AugurIlVec.java index c3a43e12372..4f159ffd1af 100644 --- a/Mage.Sets/src/mage/cards/a/AugurIlVec.java +++ b/Mage.Sets/src/mage/cards/a/AugurIlVec.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.condition.common.IsStepCondition; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.PhaseStep; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AugurOfBolas.java b/Mage.Sets/src/mage/cards/a/AugurOfBolas.java index 30b6bd28470..9990f083485 100644 --- a/Mage.Sets/src/mage/cards/a/AugurOfBolas.java +++ b/Mage.Sets/src/mage/cards/a/AugurOfBolas.java @@ -27,17 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -50,6 +45,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java b/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java index 3083ad2e5c8..297af9b865a 100644 --- a/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java +++ b/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java @@ -27,14 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.condition.common.IsStepCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; @@ -44,6 +43,8 @@ import mage.constants.PhaseStep; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AuguryAdept.java b/Mage.Sets/src/mage/cards/a/AuguryAdept.java index 67e66e5dea7..4d6bd8ec46f 100644 --- a/Mage.Sets/src/mage/cards/a/AuguryAdept.java +++ b/Mage.Sets/src/mage/cards/a/AuguryAdept.java @@ -27,24 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AuguryOwl.java b/Mage.Sets/src/mage/cards/a/AuguryOwl.java index 694b70148dd..4718fdf93cc 100644 --- a/Mage.Sets/src/mage/cards/a/AuguryOwl.java +++ b/Mage.Sets/src/mage/cards/a/AuguryOwl.java @@ -28,14 +28,15 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AuntiesHovel.java b/Mage.Sets/src/mage/cards/a/AuntiesHovel.java index 9630528e68b..531b5f84c6d 100644 --- a/Mage.Sets/src/mage/cards/a/AuntiesHovel.java +++ b/Mage.Sets/src/mage/cards/a/AuntiesHovel.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -36,10 +34,13 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java index b2d46491ec1..0064d5a1427 100644 --- a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java +++ b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.CantBlockAbility; @@ -48,6 +47,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AuraBlast.java b/Mage.Sets/src/mage/cards/a/AuraBlast.java index 641b98f7ed2..129ed105a56 100644 --- a/Mage.Sets/src/mage/cards/a/AuraBlast.java +++ b/Mage.Sets/src/mage/cards/a/AuraBlast.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AuraExtraction.java b/Mage.Sets/src/mage/cards/a/AuraExtraction.java index 4d922774a00..442161b6e69 100644 --- a/Mage.Sets/src/mage/cards/a/AuraExtraction.java +++ b/Mage.Sets/src/mage/cards/a/AuraExtraction.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.CyclingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/a/AuraFinesse.java b/Mage.Sets/src/mage/cards/a/AuraFinesse.java index 8c59f0dc4a8..ba55e2d411a 100644 --- a/Mage.Sets/src/mage/cards/a/AuraFinesse.java +++ b/Mage.Sets/src/mage/cards/a/AuraFinesse.java @@ -27,15 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -46,6 +45,8 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AuraFlux.java b/Mage.Sets/src/mage/cards/a/AuraFlux.java index 6e0d0c7265b..333eb4f8fe5 100644 --- a/Mage.Sets/src/mage/cards/a/AuraFlux.java +++ b/Mage.Sets/src/mage/cards/a/AuraFlux.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,8 +35,14 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AuraFracture.java b/Mage.Sets/src/mage/cards/a/AuraFracture.java index d47f8172506..bfd214bebba 100644 --- a/Mage.Sets/src/mage/cards/a/AuraFracture.java +++ b/Mage.Sets/src/mage/cards/a/AuraFracture.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java index 1633604e63b..0dfa3bb3b1b 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java +++ b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java @@ -27,20 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; -import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesWithLessPowerEffect; +import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AuraGraft.java b/Mage.Sets/src/mage/cards/a/AuraGraft.java index 15766254c0c..1da1d746295 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGraft.java +++ b/Mage.Sets/src/mage/cards/a/AuraGraft.java @@ -27,14 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; -import mage.constants.CardType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.Filter; @@ -50,6 +49,8 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.util.TargetAddress; +import java.util.UUID; + /** * @author duncant */ diff --git a/Mage.Sets/src/mage/cards/a/AuraMutation.java b/Mage.Sets/src/mage/cards/a/AuraMutation.java index 011d9dc6983..1a38e071cfd 100644 --- a/Mage.Sets/src/mage/cards/a/AuraMutation.java +++ b/Mage.Sets/src/mage/cards/a/AuraMutation.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java index 62130953d35..0feeee3f691 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -40,6 +37,7 @@ import mage.abilities.effects.common.UntapEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -49,6 +47,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AuraOfSilence.java b/Mage.Sets/src/mage/cards/a/AuraOfSilence.java index 63ba280baf6..eb7303c339e 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfSilence.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfSilence.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,16 +37,14 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.game.Game; import mage.target.TargetPermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AuraShards.java b/Mage.Sets/src/mage/cards/a/AuraShards.java index ed698c19d47..7e31df4cc6a 100644 --- a/Mage.Sets/src/mage/cards/a/AuraShards.java +++ b/Mage.Sets/src/mage/cards/a/AuraShards.java @@ -27,17 +27,18 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.target.TargetPermanent; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import mage.filter.common.FilterArtifactOrEnchantmentPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.target.TargetPermanent; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AuraThief.java b/Mage.Sets/src/mage/cards/a/AuraThief.java index d335a1d35c7..563ad2963e8 100644 --- a/Mage.Sets/src/mage/cards/a/AuraThief.java +++ b/Mage.Sets/src/mage/cards/a/AuraThief.java @@ -5,7 +5,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -23,6 +22,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author nick.myers diff --git a/Mage.Sets/src/mage/cards/a/Auramancer.java b/Mage.Sets/src/mage/cards/a/Auramancer.java index 7136d86f029..eb6d928570d 100644 --- a/Mage.Sets/src/mage/cards/a/Auramancer.java +++ b/Mage.Sets/src/mage/cards/a/Auramancer.java @@ -28,19 +28,19 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java index 00f22293095..4c417b5fa4d 100644 --- a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java +++ b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.List; -import java.util.UUID; -import mage.target.common.TargetCreaturePermanent; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -37,18 +34,18 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; -import mage.constants.Outcome; -import mage.target.TargetPermanent; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import mage.target.TargetPermanent; +import mage.target.common.TargetCreaturePermanent; + +import java.util.List; +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/Auratog.java b/Mage.Sets/src/mage/cards/a/Auratog.java index ff021290de8..4bd07021b51 100644 --- a/Mage.Sets/src/mage/cards/a/Auratog.java +++ b/Mage.Sets/src/mage/cards/a/Auratog.java @@ -27,21 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java index 54bf891dc94..529f1416ca5 100644 --- a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java +++ b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java @@ -27,16 +27,11 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -48,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AureliaTheWarleader.java b/Mage.Sets/src/mage/cards/a/AureliaTheWarleader.java index a5cc45e39e8..5a01bc68c9f 100644 --- a/Mage.Sets/src/mage/cards/a/AureliaTheWarleader.java +++ b/Mage.Sets/src/mage/cards/a/AureliaTheWarleader.java @@ -40,6 +40,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; @@ -58,7 +59,7 @@ public class AureliaTheWarleader extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AureliasFury.java b/Mage.Sets/src/mage/cards/a/AureliasFury.java index 04b8f22ab55..876f7293b09 100644 --- a/Mage.Sets/src/mage/cards/a/AureliasFury.java +++ b/Mage.Sets/src/mage/cards/a/AureliasFury.java @@ -27,20 +27,21 @@ */ package mage.cards.a; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Duration; -import mage.constants.WatcherScope; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.ContinuousEffect; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -54,7 +55,6 @@ import mage.watchers.Watcher; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; /** * GATECRASH FAQ 11.01.2013 diff --git a/Mage.Sets/src/mage/cards/a/AuriokBladewarden.java b/Mage.Sets/src/mage/cards/a/AuriokBladewarden.java index ccc5d95a228..84c1d75142c 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokBladewarden.java +++ b/Mage.Sets/src/mage/cards/a/AuriokBladewarden.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,13 @@ import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AuriokChampion.java b/Mage.Sets/src/mage/cards/a/AuriokChampion.java index ee3317eaad9..207e9b4af9f 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokChampion.java +++ b/Mage.Sets/src/mage/cards/a/AuriokChampion.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java b/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java index 785e330830c..1ddbd840507 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java +++ b/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java @@ -27,10 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; @@ -40,6 +36,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java b/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java index 0419bdc3a7d..a2a4ca0d7ce 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java +++ b/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedSourceCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AuriokReplica.java b/Mage.Sets/src/mage/cards/a/AuriokReplica.java index 551f6faf5d4..3ac0867a4e3 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokReplica.java +++ b/Mage.Sets/src/mage/cards/a/AuriokReplica.java @@ -28,10 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +36,15 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetSource; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java b/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java index 5abfba701cc..e80bf7bfbaf 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,11 +34,15 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterArtifactCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java index d4360d23b03..dedd985c38c 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedSourceCondition; @@ -37,11 +36,15 @@ import mage.abilities.effects.common.cost.AbilitiesCostReductionControllerEffect import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Jason E. Wall diff --git a/Mage.Sets/src/mage/cards/a/AuriokSunchaser.java b/Mage.Sets/src/mage/cards/a/AuriokSunchaser.java index 075f7f9aa1b..e6701b42b0a 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSunchaser.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSunchaser.java @@ -27,10 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; @@ -41,6 +37,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java b/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java index 3a006b8c24a..cb844ed05ce 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +34,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -45,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java b/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java index a434bf819f2..1262bdb0e11 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java +++ b/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,12 +35,15 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java b/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java index 0096b198526..9d3e49dd0aa 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java +++ b/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/Aurochs.java b/Mage.Sets/src/mage/cards/a/Aurochs.java index e243a90089c..d25d339659e 100644 --- a/Mage.Sets/src/mage/cards/a/Aurochs.java +++ b/Mage.Sets/src/mage/cards/a/Aurochs.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -42,6 +41,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/a/AurochsHerd.java b/Mage.Sets/src/mage/cards/a/AurochsHerd.java index 0d7f5e1cdb2..4ed5f1f3f9e 100644 --- a/Mage.Sets/src/mage/cards/a/AurochsHerd.java +++ b/Mage.Sets/src/mage/cards/a/AurochsHerd.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java index ca732f930a9..3311e0b4822 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java +++ b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AuroraGriffin.java b/Mage.Sets/src/mage/cards/a/AuroraGriffin.java index 72d653b9fbe..93d4c1fa8e0 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraGriffin.java +++ b/Mage.Sets/src/mage/cards/a/AuroraGriffin.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java b/Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java index 4abc5005c4b..2df86da6cbd 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java +++ b/Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.LoseLifeOpponentsEffect; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java b/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java index 4ad8d32e28d..48a502fe4ab 100644 --- a/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java +++ b/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.LeavesBattlefieldAllTriggeredAbility; @@ -58,6 +56,9 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.List; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java b/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java index 4d3d8bc625d..b3a63b297f7 100644 --- a/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.DiesTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AustereCommand.java b/Mage.Sets/src/mage/cards/a/AustereCommand.java index d0de2b03f28..e904ce3c035 100644 --- a/Mage.Sets/src/mage/cards/a/AustereCommand.java +++ b/Mage.Sets/src/mage/cards/a/AustereCommand.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java b/Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java index ccd9f1f103d..dfbb3a648d5 100644 --- a/Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java +++ b/Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -35,11 +34,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -47,6 +42,8 @@ import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AutochthonWurm.java b/Mage.Sets/src/mage/cards/a/AutochthonWurm.java index 8d1ed7af839..62c81288728 100644 --- a/Mage.Sets/src/mage/cards/a/AutochthonWurm.java +++ b/Mage.Sets/src/mage/cards/a/AutochthonWurm.java @@ -27,14 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AutumnalGloom.java b/Mage.Sets/src/mage/cards/a/AutumnalGloom.java index 5f1706be552..1edddec0ed8 100644 --- a/Mage.Sets/src/mage/cards/a/AutumnalGloom.java +++ b/Mage.Sets/src/mage/cards/a/AutumnalGloom.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AutumnsVeil.java b/Mage.Sets/src/mage/cards/a/AutumnsVeil.java index d0891add70c..05a1be929fc 100644 --- a/Mage.Sets/src/mage/cards/a/AutumnsVeil.java +++ b/Mage.Sets/src/mage/cards/a/AutumnsVeil.java @@ -28,19 +28,20 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.ObjectColor; import mage.abilities.effects.common.CantBeCounteredControlledEffect; import mage.abilities.effects.common.CantBeTargetedAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java b/Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java index 807e078e43d..87a6dafd685 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java +++ b/Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -39,9 +38,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * @author noxx @@ -50,7 +52,7 @@ public class AvacynAngelOfHope extends CardImpl { public AvacynAngelOfHope(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java index 9ce0dba3039..42532c5f2ec 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -41,10 +40,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -53,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -67,7 +65,7 @@ public class AvacynGuardianAngel extends CardImpl { public AvacynGuardianAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java index 28601bc1992..82a517596fe 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java +++ b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -38,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -46,6 +45,9 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes @@ -54,7 +56,7 @@ public class AvacynThePurifier extends CardImpl { public AvacynThePurifier(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java b/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java index 3124c8a0ba3..342d51d0dbd 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java +++ b/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java @@ -27,19 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.EquippedSourceCondition; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.l.LunarchInquisitors; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.l.LunarchInquisitors; import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvacynianPriest.java b/Mage.Sets/src/mage/cards/a/AvacynianPriest.java index 9110af44329..8ab7e35dde5 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynianPriest.java +++ b/Mage.Sets/src/mage/cards/a/AvacynianPriest.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -36,11 +35,12 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.target.common.TargetCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AvacynsCollar.java b/Mage.Sets/src/mage/cards/a/AvacynsCollar.java index 64300fa9861..9f2535e3534 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynsCollar.java +++ b/Mage.Sets/src/mage/cards/a/AvacynsCollar.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -49,6 +48,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java b/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java index 3fcfd65d159..11c9e444de7 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java +++ b/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.game.Game; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java b/Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java index 1005655412e..e3581b613ab 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java +++ b/Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java @@ -28,11 +28,11 @@ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AvalancheRiders.java b/Mage.Sets/src/mage/cards/a/AvalancheRiders.java index faca62bd648..85a7841df0f 100644 --- a/Mage.Sets/src/mage/cards/a/AvalancheRiders.java +++ b/Mage.Sets/src/mage/cards/a/AvalancheRiders.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,8 +35,11 @@ import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/a/AvalancheTusker.java b/Mage.Sets/src/mage/cards/a/AvalancheTusker.java index 5f725d68b94..5ae0e544e97 100644 --- a/Mage.Sets/src/mage/cards/a/AvalancheTusker.java +++ b/Mage.Sets/src/mage/cards/a/AvalancheTusker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.combat.MustBeBlockedByTargetSourceEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/Avarax.java b/Mage.Sets/src/mage/cards/a/Avarax.java index dcc08f1b97b..49580f60aa4 100644 --- a/Mage.Sets/src/mage/cards/a/Avarax.java +++ b/Mage.Sets/src/mage/cards/a/Avarax.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvariceAmulet.java b/Mage.Sets/src/mage/cards/a/AvariceAmulet.java index 82c88936af0..19948185ce0 100644 --- a/Mage.Sets/src/mage/cards/a/AvariceAmulet.java +++ b/Mage.Sets/src/mage/cards/a/AvariceAmulet.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -42,18 +41,13 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -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.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AvariceTotem.java b/Mage.Sets/src/mage/cards/a/AvariceTotem.java index d37036930d6..a419fced0c0 100644 --- a/Mage.Sets/src/mage/cards/a/AvariceTotem.java +++ b/Mage.Sets/src/mage/cards/a/AvariceTotem.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AvariciousDragon.java b/Mage.Sets/src/mage/cards/a/AvariciousDragon.java index b07f5d5d3f3..e060c48b1f5 100644 --- a/Mage.Sets/src/mage/cards/a/AvariciousDragon.java +++ b/Mage.Sets/src/mage/cards/a/AvariciousDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java b/Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java index 338e7cd82a1..f59f6e4c43f 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfFury.java b/Mage.Sets/src/mage/cards/a/AvatarOfFury.java index 659077c6a5f..af69045b85c 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfFury.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -47,6 +46,8 @@ import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfHope.java b/Mage.Sets/src/mage/cards/a/AvatarOfHope.java index 140598ea3a7..e6b82995be2 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfHope.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfHope.java @@ -27,29 +27,24 @@ */ package mage.cards.a; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.AdjustingSourceCosts; -import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect; +import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.FlashbackAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.Duration; -import mage.constants.Outcome; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; import java.util.UUID; -import mage.constants.AbilityType; -import mage.constants.CostModificationType; /** * diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfMight.java b/Mage.Sets/src/mage/cards/a/AvatarOfMight.java index 824fe5e1e85..8aabae5293c 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfMight.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfMight.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -37,15 +36,13 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java b/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java index 9f349359819..c181cc67d56 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java b/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java index f081646aa9d..7ec0c4ad1da 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -43,6 +42,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfWill.java b/Mage.Sets/src/mage/cards/a/AvatarOfWill.java index fb780a99afc..b25b998670a 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfWill.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfWill.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -37,14 +36,12 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java b/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java index 54eecc6309f..23532d26ac8 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -41,15 +40,13 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AvenArcher.java b/Mage.Sets/src/mage/cards/a/AvenArcher.java index 44ea4913122..e1a1586f655 100644 --- a/Mage.Sets/src/mage/cards/a/AvenArcher.java +++ b/Mage.Sets/src/mage/cards/a/AvenArcher.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/a/AvenAugur.java b/Mage.Sets/src/mage/cards/a/AvenAugur.java index 455b211b365..13dcd0f1d56 100644 --- a/Mage.Sets/src/mage/cards/a/AvenAugur.java +++ b/Mage.Sets/src/mage/cards/a/AvenAugur.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.condition.common.IsStepCondition; @@ -42,6 +41,8 @@ import mage.constants.PhaseStep; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvenBattlePriest.java b/Mage.Sets/src/mage/cards/a/AvenBattlePriest.java index 219916c7cd5..6822618ec6c 100644 --- a/Mage.Sets/src/mage/cards/a/AvenBattlePriest.java +++ b/Mage.Sets/src/mage/cards/a/AvenBattlePriest.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java index 8e29f73e35e..9da1cf49171 100644 --- a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java +++ b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java b/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java index cb06cbb857f..a34cd1bfb35 100644 --- a/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java +++ b/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AvenEnvoy.java b/Mage.Sets/src/mage/cards/a/AvenEnvoy.java index 950eff8eb2a..5be8f054087 100644 --- a/Mage.Sets/src/mage/cards/a/AvenEnvoy.java +++ b/Mage.Sets/src/mage/cards/a/AvenEnvoy.java @@ -27,12 +27,13 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AvenFarseer.java b/Mage.Sets/src/mage/cards/a/AvenFarseer.java index 898ef40094e..fb869c6ab5a 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFarseer.java +++ b/Mage.Sets/src/mage/cards/a/AvenFarseer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.TurnedFaceUpAllTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AvenFateshaper.java b/Mage.Sets/src/mage/cards/a/AvenFateshaper.java index e183c583886..59d6f19d5c3 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFateshaper.java +++ b/Mage.Sets/src/mage/cards/a/AvenFateshaper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AvenFisher.java b/Mage.Sets/src/mage/cards/a/AvenFisher.java index 3f1c959ec42..4442dfd403c 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFisher.java +++ b/Mage.Sets/src/mage/cards/a/AvenFisher.java @@ -27,14 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AvenFleetwing.java b/Mage.Sets/src/mage/cards/a/AvenFleetwing.java index 3248d728537..036991217fa 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFleetwing.java +++ b/Mage.Sets/src/mage/cards/a/AvenFleetwing.java @@ -28,14 +28,14 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AvenFlock.java b/Mage.Sets/src/mage/cards/a/AvenFlock.java index 525773d6651..4fbdbb19b04 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFlock.java +++ b/Mage.Sets/src/mage/cards/a/AvenFlock.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AvenFogbringer.java b/Mage.Sets/src/mage/cards/a/AvenFogbringer.java index eacd7cc16ea..b202bd3bf10 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFogbringer.java +++ b/Mage.Sets/src/mage/cards/a/AvenFogbringer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AvenLiberator.java b/Mage.Sets/src/mage/cards/a/AvenLiberator.java index d69cba90d1b..321bff9aa84 100644 --- a/Mage.Sets/src/mage/cards/a/AvenLiberator.java +++ b/Mage.Sets/src/mage/cards/a/AvenLiberator.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AvenMimeomancer.java b/Mage.Sets/src/mage/cards/a/AvenMimeomancer.java index f6fdb82b2dc..a42ca844de7 100644 --- a/Mage.Sets/src/mage/cards/a/AvenMimeomancer.java +++ b/Mage.Sets/src/mage/cards/a/AvenMimeomancer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -37,18 +36,14 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -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.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AvenMindcensor.java b/Mage.Sets/src/mage/cards/a/AvenMindcensor.java index 4d20e238ad4..75d1d4ba01b 100644 --- a/Mage.Sets/src/mage/cards/a/AvenMindcensor.java +++ b/Mage.Sets/src/mage/cards/a/AvenMindcensor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java index 53782508c3a..23d64cccd55 100644 --- a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java +++ b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java b/Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java index d20eef5d9c8..9561da86edc 100644 --- a/Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java +++ b/Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/a/AvenSkirmisher.java b/Mage.Sets/src/mage/cards/a/AvenSkirmisher.java index e868d59b214..7e006e967ed 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSkirmisher.java +++ b/Mage.Sets/src/mage/cards/a/AvenSkirmisher.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java b/Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java index b0ce9690388..8e19bffe4ca 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java +++ b/Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java b/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java index 6a53d677af4..1175fe19e4a 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java +++ b/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvenSquire.java b/Mage.Sets/src/mage/cards/a/AvenSquire.java index 24c57199368..d8a2114cafd 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSquire.java +++ b/Mage.Sets/src/mage/cards/a/AvenSquire.java @@ -28,12 +28,12 @@ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AvenSunstriker.java b/Mage.Sets/src/mage/cards/a/AvenSunstriker.java index 473b58bc2f5..1f2a3beff91 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSunstriker.java +++ b/Mage.Sets/src/mage/cards/a/AvenSunstriker.java @@ -27,16 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.DoubleStrikeAbility; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AvenSurveyor.java b/Mage.Sets/src/mage/cards/a/AvenSurveyor.java index e49fdce344d..1edb4ec785a 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSurveyor.java +++ b/Mage.Sets/src/mage/cards/a/AvenSurveyor.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AvenTactician.java b/Mage.Sets/src/mage/cards/a/AvenTactician.java index 6e04d2fede7..d40242599d0 100644 --- a/Mage.Sets/src/mage/cards/a/AvenTactician.java +++ b/Mage.Sets/src/mage/cards/a/AvenTactician.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.keyword.BolsterEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvenTrailblazer.java b/Mage.Sets/src/mage/cards/a/AvenTrailblazer.java index c342fb613b1..11c9dd63d98 100644 --- a/Mage.Sets/src/mage/cards/a/AvenTrailblazer.java +++ b/Mage.Sets/src/mage/cards/a/AvenTrailblazer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.DomainValue; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AvenTrooper.java b/Mage.Sets/src/mage/cards/a/AvenTrooper.java index ed3d5658b7d..1731c930941 100644 --- a/Mage.Sets/src/mage/cards/a/AvenTrooper.java +++ b/Mage.Sets/src/mage/cards/a/AvenTrooper.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AvenWarhawk.java b/Mage.Sets/src/mage/cards/a/AvenWarhawk.java index 59e184a86ca..4609789259a 100644 --- a/Mage.Sets/src/mage/cards/a/AvenWarhawk.java +++ b/Mage.Sets/src/mage/cards/a/AvenWarhawk.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.AmplifyEffect; import mage.abilities.keyword.AmplifyAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AvenWindreader.java b/Mage.Sets/src/mage/cards/a/AvenWindreader.java index 3a3ea5632aa..e933b0b773e 100644 --- a/Mage.Sets/src/mage/cards/a/AvenWindreader.java +++ b/Mage.Sets/src/mage/cards/a/AvenWindreader.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/a/AvengerEnDal.java b/Mage.Sets/src/mage/cards/a/AvengerEnDal.java index fa8fc543ff1..f188e83566e 100644 --- a/Mage.Sets/src/mage/cards/a/AvengerEnDal.java +++ b/Mage.Sets/src/mage/cards/a/AvengerEnDal.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java b/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java index 8da03b8c9fb..749ef544652 100644 --- a/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java +++ b/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java @@ -28,8 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LandfallAbility; @@ -38,6 +36,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledLandPermanent; @@ -45,6 +44,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.PlantToken; +import java.util.UUID; + /** * * @author Loki, nantuko, North diff --git a/Mage.Sets/src/mage/cards/a/AvengingAngel.java b/Mage.Sets/src/mage/cards/a/AvengingAngel.java index dfc06ca3141..743fbc3e03d 100644 --- a/Mage.Sets/src/mage/cards/a/AvengingAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvengingAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AvengingDruid.java b/Mage.Sets/src/mage/cards/a/AvengingDruid.java index f3a8183a9a7..7ea9174674f 100644 --- a/Mage.Sets/src/mage/cards/a/AvengingDruid.java +++ b/Mage.Sets/src/mage/cards/a/AvengingDruid.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageToOpponentTriggeredAbility; import mage.abilities.effects.common.RevealCardsFromLibraryUntilEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AvianChangeling.java b/Mage.Sets/src/mage/cards/a/AvianChangeling.java index cd80ea153ca..6d985e28f79 100644 --- a/Mage.Sets/src/mage/cards/a/AvianChangeling.java +++ b/Mage.Sets/src/mage/cards/a/AvianChangeling.java @@ -27,12 +27,12 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AviaryMechanic.java b/Mage.Sets/src/mage/cards/a/AviaryMechanic.java index c3841e61c88..aea2cb144b9 100644 --- a/Mage.Sets/src/mage/cards/a/AviaryMechanic.java +++ b/Mage.Sets/src/mage/cards/a/AviaryMechanic.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/Avizoa.java b/Mage.Sets/src/mage/cards/a/Avizoa.java index a3d58d0f0a7..f53c7bed819 100644 --- a/Mage.Sets/src/mage/cards/a/Avizoa.java +++ b/Mage.Sets/src/mage/cards/a/Avizoa.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/a/AvoidFate.java b/Mage.Sets/src/mage/cards/a/AvoidFate.java index 64541bcecdd..76ae7f4932c 100644 --- a/Mage.Sets/src/mage/cards/a/AvoidFate.java +++ b/Mage.Sets/src/mage/cards/a/AvoidFate.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.TargetsPermanentPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheBear.java b/Mage.Sets/src/mage/cards/a/AwakenTheBear.java index 67c8b342b50..ccedddb769e 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheBear.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheBear.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java b/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java index 0e8f639eab7..a068f800947 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.CreateTokenEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.DragonToken2; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java index 93de512dbec..ea9cdc8955f 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java +++ b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -38,6 +35,8 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Layer; import mage.constants.SubLayer; import mage.filter.common.FilterLandPermanent; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/Awakening.java b/Mage.Sets/src/mage/cards/a/Awakening.java index a8fe2e19386..5a65aff245d 100644 --- a/Mage.Sets/src/mage/cards/a/Awakening.java +++ b/Mage.Sets/src/mage/cards/a/Awakening.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.UntapAllEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AwakeningZone.java b/Mage.Sets/src/mage/cards/a/AwakeningZone.java index 47d0cc2bc56..2189b9df977 100644 --- a/Mage.Sets/src/mage/cards/a/AwakeningZone.java +++ b/Mage.Sets/src/mage/cards/a/AwakeningZone.java @@ -28,7 +28,6 @@ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.game.permanent.token.EldraziSpawnToken; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/a/AweForTheGuilds.java b/Mage.Sets/src/mage/cards/a/AweForTheGuilds.java index 107a4c4e683..c846db35775 100644 --- a/Mage.Sets/src/mage/cards/a/AweForTheGuilds.java +++ b/Mage.Sets/src/mage/cards/a/AweForTheGuilds.java @@ -28,16 +28,17 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.combat.CantBlockAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.MulticoloredPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AweStrike.java b/Mage.Sets/src/mage/cards/a/AweStrike.java index e8f508960f4..47d44dd0bc0 100755 --- a/Mage.Sets/src/mage/cards/a/AweStrike.java +++ b/Mage.Sets/src/mage/cards/a/AweStrike.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectData; import mage.abilities.effects.PreventionEffectImpl; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author brikr */ diff --git a/Mage.Sets/src/mage/cards/a/AwokenHorror.java b/Mage.Sets/src/mage/cards/a/AwokenHorror.java index 8a3a64a9170..1b2e644b910 100644 --- a/Mage.Sets/src/mage/cards/a/AwokenHorror.java +++ b/Mage.Sets/src/mage/cards/a/AwokenHorror.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AxebaneGuardian.java b/Mage.Sets/src/mage/cards/a/AxebaneGuardian.java index 0f52894c221..d158db9192f 100644 --- a/Mage.Sets/src/mage/cards/a/AxebaneGuardian.java +++ b/Mage.Sets/src/mage/cards/a/AxebaneGuardian.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,8 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/a/AxebaneStag.java b/Mage.Sets/src/mage/cards/a/AxebaneStag.java index d95694f7044..1fe8546fa4c 100644 --- a/Mage.Sets/src/mage/cards/a/AxebaneStag.java +++ b/Mage.Sets/src/mage/cards/a/AxebaneStag.java @@ -27,11 +27,12 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AxegrinderGiant.java b/Mage.Sets/src/mage/cards/a/AxegrinderGiant.java index 064f6d28e9d..b94c5404f5c 100644 --- a/Mage.Sets/src/mage/cards/a/AxegrinderGiant.java +++ b/Mage.Sets/src/mage/cards/a/AxegrinderGiant.java @@ -27,10 +27,10 @@ */ package mage.cards.a; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java b/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java index eca501c9f87..bf60957b7fe 100644 --- a/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java +++ b/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; @@ -53,6 +53,8 @@ import mage.players.Player; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -66,7 +68,7 @@ public class AyliEternalPilgrim extends CardImpl { public AyliEternalPilgrim(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Kor"); this.subtype.add("Cleric"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AysenAbbey.java b/Mage.Sets/src/mage/cards/a/AysenAbbey.java index 04943fb09bf..94c48e588c4 100644 --- a/Mage.Sets/src/mage/cards/a/AysenAbbey.java +++ b/Mage.Sets/src/mage/cards/a/AysenAbbey.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java b/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java index 37d11c95742..6bf5bc939ae 100644 --- a/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java +++ b/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AysenHighway.java b/Mage.Sets/src/mage/cards/a/AysenHighway.java index bed31930db1..5f02d0d503c 100644 --- a/Mage.Sets/src/mage/cards/a/AysenHighway.java +++ b/Mage.Sets/src/mage/cards/a/AysenHighway.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java b/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java index cacd175f96a..0e6284960cd 100644 --- a/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java +++ b/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java @@ -27,15 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.LandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,7 +51,7 @@ public class AyumiTheLastVisitor extends CardImpl { public AyumiTheLastVisitor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java index 8810f15e57c..3471a480ac9 100644 --- a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java +++ b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java @@ -28,15 +28,14 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * @author Loki */ @@ -58,7 +59,7 @@ public class AzamiLadyOfScrolls extends CardImpl { public AzamiLadyOfScrolls(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/a/AzimaetDrake.java b/Mage.Sets/src/mage/cards/a/AzimaetDrake.java index 5129e2547ce..ad787caabcd 100644 --- a/Mage.Sets/src/mage/cards/a/AzimaetDrake.java +++ b/Mage.Sets/src/mage/cards/a/AzimaetDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java b/Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java index fb94ae39d7e..327c7b57285 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/a/AzoriusArrester.java b/Mage.Sets/src/mage/cards/a/AzoriusArrester.java index 3c103775b97..10eeea8c6c4 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusArrester.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusArrester.java @@ -27,20 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AzoriusChancery.java b/Mage.Sets/src/mage/cards/a/AzoriusChancery.java index 769c887bed9..4d2e0cd45f2 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusChancery.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusChancery.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/a/AzoriusCharm.java b/Mage.Sets/src/mage/cards/a/AzoriusCharm.java index 4ee440947db..5958722a155 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusCharm.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusCharm.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; @@ -37,10 +34,13 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AzoriusCluestone.java b/Mage.Sets/src/mage/cards/a/AzoriusCluestone.java index 017174168f3..53ea3280835 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusCluestone.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusCluestone.java @@ -28,9 +28,6 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +38,10 @@ import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java b/Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java index a9f926202df..3c8a33808bf 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ProtectionAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterEnchantmentCard; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java b/Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java index 286aaa22920..da16de069d7 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java @@ -27,13 +27,14 @@ */ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java b/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java index f8da71486e5..dccf78fba7d 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.target.common.TargetActivatedAbility; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/a/AzoriusHerald.java b/Mage.Sets/src/mage/cards/a/AzoriusHerald.java index 3cc00737309..dca809bc52b 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusHerald.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusHerald.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ManaWasSpentCondition; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.watchers.common.ManaSpentToCastWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java b/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java index 1715e9a072c..f91a365f636 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java @@ -27,20 +27,20 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DetainTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/a/AzoriusSignet.java b/Mage.Sets/src/mage/cards/a/AzoriusSignet.java index 492d94cab15..323e6e599aa 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusSignet.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusSignet.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -37,8 +34,11 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/a/AzorsElocutors.java b/Mage.Sets/src/mage/cards/a/AzorsElocutors.java index 2c40818eaf8..51fa3bb6a27 100644 --- a/Mage.Sets/src/mage/cards/a/AzorsElocutors.java +++ b/Mage.Sets/src/mage/cards/a/AzorsElocutors.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -47,6 +46,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/a/AzureDrake.java b/Mage.Sets/src/mage/cards/a/AzureDrake.java index b3d8c2d5b81..2ad4057f7e4 100644 --- a/Mage.Sets/src/mage/cards/a/AzureDrake.java +++ b/Mage.Sets/src/mage/cards/a/AzureDrake.java @@ -28,12 +28,13 @@ package mage.cards.a; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/a/AzureMage.java b/Mage.Sets/src/mage/cards/a/AzureMage.java index 923248e7265..8f54b72e44d 100644 --- a/Mage.Sets/src/mage/cards/a/AzureMage.java +++ b/Mage.Sets/src/mage/cards/a/AzureMage.java @@ -28,17 +28,17 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java b/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java index ec88c63cc33..2232946188b 100644 --- a/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java +++ b/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java @@ -28,17 +28,18 @@ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.PlayAdditionalLandsControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki @@ -47,7 +48,7 @@ public class AzusaLostButSeeking extends CardImpl { public AzusaLostButSeeking (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Monk"); diff --git a/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java b/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java index c91caa44ee5..b8e89925a69 100644 --- a/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java +++ b/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.Cost; @@ -47,6 +46,8 @@ import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/b/BackToBasics.java b/Mage.Sets/src/mage/cards/b/BackToBasics.java index 462683bc5f6..ccfb6bf5ad5 100644 --- a/Mage.Sets/src/mage/cards/b/BackToBasics.java +++ b/Mage.Sets/src/mage/cards/b/BackToBasics.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BackToNature.java b/Mage.Sets/src/mage/cards/b/BackToNature.java index c8863dbcc43..56cfde8cafc 100644 --- a/Mage.Sets/src/mage/cards/b/BackToNature.java +++ b/Mage.Sets/src/mage/cards/b/BackToNature.java @@ -28,13 +28,14 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterEnchantmentPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/Backlash.java b/Mage.Sets/src/mage/cards/b/Backlash.java index b4005509190..1dc72e1f45e 100644 --- a/Mage.Sets/src/mage/cards/b/Backlash.java +++ b/Mage.Sets/src/mage/cards/b/Backlash.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java b/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java index f4e0995ddd7..1b54b599c28 100644 --- a/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java +++ b/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BadMoon.java b/Mage.Sets/src/mage/cards/b/BadMoon.java index ba2906113cd..65cdb73d5c1 100644 --- a/Mage.Sets/src/mage/cards/b/BadMoon.java +++ b/Mage.Sets/src/mage/cards/b/BadMoon.java @@ -27,19 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BadRiver.java b/Mage.Sets/src/mage/cards/b/BadRiver.java index 430009d0d54..482e9370069 100644 --- a/Mage.Sets/src/mage/cards/b/BadRiver.java +++ b/Mage.Sets/src/mage/cards/b/BadRiver.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Badlands.java b/Mage.Sets/src/mage/cards/b/Badlands.java index 7611a301cfc..731cea3c8dd 100644 --- a/Mage.Sets/src/mage/cards/b/Badlands.java +++ b/Mage.Sets/src/mage/cards/b/Badlands.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BakuAltar.java b/Mage.Sets/src/mage/cards/b/BakuAltar.java index 4af0dc4faa4..092b1ca7c83 100644 --- a/Mage.Sets/src/mage/cards/b/BakuAltar.java +++ b/Mage.Sets/src/mage/cards/b/BakuAltar.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -40,11 +37,14 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.permanent.token.SpiritToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BalaGedScorpion.java b/Mage.Sets/src/mage/cards/b/BalaGedScorpion.java index c8b6a2aed95..23db3304a96 100644 --- a/Mage.Sets/src/mage/cards/b/BalaGedScorpion.java +++ b/Mage.Sets/src/mage/cards/b/BalaGedScorpion.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BalaGedThief.java b/Mage.Sets/src/mage/cards/b/BalaGedThief.java index d7062bba327..41683254522 100644 --- a/Mage.Sets/src/mage/cards/b/BalaGedThief.java +++ b/Mage.Sets/src/mage/cards/b/BalaGedThief.java @@ -27,17 +27,11 @@ */ package mage.cards.b; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -49,6 +43,9 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.TargetPlayer; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/Balance.java b/Mage.Sets/src/mage/cards/b/Balance.java index 1c8a54a7e2f..037b1549d7b 100644 --- a/Mage.Sets/src/mage/cards/b/Balance.java +++ b/Mage.Sets/src/mage/cards/b/Balance.java @@ -27,15 +27,9 @@ */ package mage.cards.b; -import java.util.HashMap; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterCard; @@ -47,6 +41,9 @@ import mage.players.Player; import mage.target.common.TargetCardInHand; import mage.target.common.TargetControlledPermanent; +import java.util.HashMap; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BalanceOfPower.java b/Mage.Sets/src/mage/cards/b/BalanceOfPower.java index 75578ebbc35..00773989476 100644 --- a/Mage.Sets/src/mage/cards/b/BalanceOfPower.java +++ b/Mage.Sets/src/mage/cards/b/BalanceOfPower.java @@ -27,17 +27,18 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BalancingAct.java b/Mage.Sets/src/mage/cards/b/BalancingAct.java index 027f1edb606..581096555a4 100644 --- a/Mage.Sets/src/mage/cards/b/BalancingAct.java +++ b/Mage.Sets/src/mage/cards/b/BalancingAct.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.common.TargetCardInHand; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman (Restore Balance), cbt33 diff --git a/Mage.Sets/src/mage/cards/b/BalduvianBarbarians.java b/Mage.Sets/src/mage/cards/b/BalduvianBarbarians.java index 0bf5ef3210a..9f94c06bb34 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianBarbarians.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianBarbarians.java @@ -27,11 +27,12 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BalduvianBears.java b/Mage.Sets/src/mage/cards/b/BalduvianBears.java index 18620136b6e..fc141d9e566 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianBears.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianBears.java @@ -27,11 +27,12 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BalduvianDead.java b/Mage.Sets/src/mage/cards/b/BalduvianDead.java index 568883f8ba2..e6bb072ed43 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianDead.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianDead.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -51,6 +50,8 @@ import mage.game.permanent.token.Token; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BalduvianHorde.java b/Mage.Sets/src/mage/cards/b/BalduvianHorde.java index 24942465c2f..0aea9b32d2e 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianHorde.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianHorde.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BalduvianRage.java b/Mage.Sets/src/mage/cards/b/BalduvianRage.java index 818e62bbb06..b47b73b8f88 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianRage.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianRage.java @@ -27,21 +27,20 @@ */ package mage.cards.b; -import java.util.UUID; - +import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; +import mage.abilities.dynamicvalue.common.ManacostVariableValue; +import mage.abilities.dynamicvalue.common.StaticValue; +import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.abilities.dynamicvalue.common.ManacostVariableValue; -import mage.abilities.dynamicvalue.common.StaticValue; -import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.filter.common.FilterAttackingCreature; import mage.target.common.TargetCreaturePermanent; -import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; -import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; -import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; /** diff --git a/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java b/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java index 0d7819d74f9..09ddfe4c5e4 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetAttackingCreature; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BalduvianWarMakers.java b/Mage.Sets/src/mage/cards/b/BalduvianWarMakers.java index 753371ef4ea..14583632c60 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianWarMakers.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianWarMakers.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.RampageAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BalefireDragon.java b/Mage.Sets/src/mage/cards/b/BalefireDragon.java index 8e08c074b21..2ea177cf1dc 100644 --- a/Mage.Sets/src/mage/cards/b/BalefireDragon.java +++ b/Mage.Sets/src/mage/cards/b/BalefireDragon.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -37,11 +34,15 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/b/BalefireLiege.java b/Mage.Sets/src/mage/cards/b/BalefireLiege.java index 13bb64a5ec6..f1b112208d3 100644 --- a/Mage.Sets/src/mage/cards/b/BalefireLiege.java +++ b/Mage.Sets/src/mage/cards/b/BalefireLiege.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +37,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterSpell; @@ -47,6 +45,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BalefulEidolon.java b/Mage.Sets/src/mage/cards/b/BalefulEidolon.java index d8f6622706d..3cf3e9f55f0 100644 --- a/Mage.Sets/src/mage/cards/b/BalefulEidolon.java +++ b/Mage.Sets/src/mage/cards/b/BalefulEidolon.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BalefulForce.java b/Mage.Sets/src/mage/cards/b/BalefulForce.java index 8d4ed15498c..c0bdd893b98 100644 --- a/Mage.Sets/src/mage/cards/b/BalefulForce.java +++ b/Mage.Sets/src/mage/cards/b/BalefulForce.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BalefulStare.java b/Mage.Sets/src/mage/cards/b/BalefulStare.java index 378212c0e5a..a74ce3ceb72 100644 --- a/Mage.Sets/src/mage/cards/b/BalefulStare.java +++ b/Mage.Sets/src/mage/cards/b/BalefulStare.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BalefulStrix.java b/Mage.Sets/src/mage/cards/b/BalefulStrix.java index 04b06132af9..56e0dff72d1 100644 --- a/Mage.Sets/src/mage/cards/b/BalefulStrix.java +++ b/Mage.Sets/src/mage/cards/b/BalefulStrix.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -36,6 +34,9 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BallLightning.java b/Mage.Sets/src/mage/cards/b/BallLightning.java index e55b9fab889..c454d8e9807 100644 --- a/Mage.Sets/src/mage/cards/b/BallLightning.java +++ b/Mage.Sets/src/mage/cards/b/BallLightning.java @@ -28,8 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -37,8 +35,11 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BallistaCharger.java b/Mage.Sets/src/mage/cards/b/BallistaCharger.java index 5a893801647..36c1af6f0d7 100644 --- a/Mage.Sets/src/mage/cards/b/BallistaCharger.java +++ b/Mage.Sets/src/mage/cards/b/BallistaCharger.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/b/BallistaSquad.java b/Mage.Sets/src/mage/cards/b/BallistaSquad.java index 7995b5c8cbd..501af11b536 100644 --- a/Mage.Sets/src/mage/cards/b/BallistaSquad.java +++ b/Mage.Sets/src/mage/cards/b/BallistaSquad.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +36,12 @@ import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BalloonPeddler.java b/Mage.Sets/src/mage/cards/b/BalloonPeddler.java index 456ee1ab68c..e3a412b1da1 100644 --- a/Mage.Sets/src/mage/cards/b/BalloonPeddler.java +++ b/Mage.Sets/src/mage/cards/b/BalloonPeddler.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BallynockCohort.java b/Mage.Sets/src/mage/cards/b/BallynockCohort.java index 8c9a9ec7241..bba09b860e8 100644 --- a/Mage.Sets/src/mage/cards/b/BallynockCohort.java +++ b/Mage.Sets/src/mage/cards/b/BallynockCohort.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.CountType; @@ -47,6 +46,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BallynockTrapper.java b/Mage.Sets/src/mage/cards/b/BallynockTrapper.java index 6bcaf44f219..ecc1b0d0dec 100644 --- a/Mage.Sets/src/mage/cards/b/BallynockTrapper.java +++ b/Mage.Sets/src/mage/cards/b/BallynockTrapper.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,11 +37,14 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java b/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java index 47f5d254433..4c353c670c6 100644 --- a/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java index 7e9309db425..04c1249545e 100644 --- a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java +++ b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java index 54d837071ca..7a9ee33e3ec 100644 --- a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java +++ b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; @@ -42,6 +40,9 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.BeastToken2; import mage.watchers.common.PermanentsEnteredBattlefieldWatcher; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BalothNull.java b/Mage.Sets/src/mage/cards/b/BalothNull.java index a52f5368ad9..a74edef1e5b 100644 --- a/Mage.Sets/src/mage/cards/b/BalothNull.java +++ b/Mage.Sets/src/mage/cards/b/BalothNull.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BalothPup.java b/Mage.Sets/src/mage/cards/b/BalothPup.java index 14f4b9f5b98..059e91266d7 100644 --- a/Mage.Sets/src/mage/cards/b/BalothPup.java +++ b/Mage.Sets/src/mage/cards/b/BalothPup.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasCounterCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BalothWoodcrasher.java b/Mage.Sets/src/mage/cards/b/BalothWoodcrasher.java index 072e520e1b9..087d37b3dfb 100644 --- a/Mage.Sets/src/mage/cards/b/BalothWoodcrasher.java +++ b/Mage.Sets/src/mage/cards/b/BalothWoodcrasher.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -38,6 +34,10 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java b/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java index 9aed9f1cc66..ef9ab07cbac 100644 --- a/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java +++ b/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author cbt33, noxx (DiscardCardYouChooseTargetOpponentEffect) diff --git a/Mage.Sets/src/mage/cards/b/BalshanCollaborator.java b/Mage.Sets/src/mage/cards/b/BalshanCollaborator.java index 570bf679b5d..1cfdc5e4415 100644 --- a/Mage.Sets/src/mage/cards/b/BalshanCollaborator.java +++ b/Mage.Sets/src/mage/cards/b/BalshanCollaborator.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BalshanGriffin.java b/Mage.Sets/src/mage/cards/b/BalshanGriffin.java index fb23265d14b..747e03acfa0 100644 --- a/Mage.Sets/src/mage/cards/b/BalshanGriffin.java +++ b/Mage.Sets/src/mage/cards/b/BalshanGriffin.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java index 5aaba67d0a9..098072c954f 100644 --- a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java +++ b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,10 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -52,6 +48,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +58,7 @@ public class BalthorTheDefiled extends CardImpl { public BalthorTheDefiled(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Dwarf"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheStout.java b/Mage.Sets/src/mage/cards/b/BalthorTheStout.java index 72f25726e66..32aac8c25d0 100644 --- a/Mage.Sets/src/mage/cards/b/BalthorTheStout.java +++ b/Mage.Sets/src/mage/cards/b/BalthorTheStout.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +38,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -62,7 +64,7 @@ public class BalthorTheStout extends CardImpl { public BalthorTheStout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dwarf"); this.subtype.add("Barbarian"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/BalustradeSpy.java b/Mage.Sets/src/mage/cards/b/BalustradeSpy.java index 9620c233012..eeba722876b 100644 --- a/Mage.Sets/src/mage/cards/b/BalustradeSpy.java +++ b/Mage.Sets/src/mage/cards/b/BalustradeSpy.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -41,10 +37,15 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Bandage.java b/Mage.Sets/src/mage/cards/b/Bandage.java index 30b9db2e741..a8abc2666ab 100644 --- a/Mage.Sets/src/mage/cards/b/Bandage.java +++ b/Mage.Sets/src/mage/cards/b/Bandage.java @@ -27,16 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BaneAlleyBlackguard.java b/Mage.Sets/src/mage/cards/b/BaneAlleyBlackguard.java index 461b8ab6abd..e58b7c9abe1 100644 --- a/Mage.Sets/src/mage/cards/b/BaneAlleyBlackguard.java +++ b/Mage.Sets/src/mage/cards/b/BaneAlleyBlackguard.java @@ -28,11 +28,12 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java b/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java index 3226e3cd65b..be4f85677fd 100644 --- a/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java +++ b/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -43,11 +40,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.game.ExileZone; import mage.game.Game; @@ -57,6 +50,10 @@ import mage.target.common.TargetCardInExile; import mage.target.common.TargetCardInHand; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * Gatecrash FAQ (01.2013) * diff --git a/Mage.Sets/src/mage/cards/b/BaneOfBalaGed.java b/Mage.Sets/src/mage/cards/b/BaneOfBalaGed.java index 1343eee1059..7faaba34964 100644 --- a/Mage.Sets/src/mage/cards/b/BaneOfBalaGed.java +++ b/Mage.Sets/src/mage/cards/b/BaneOfBalaGed.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -46,6 +43,10 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BaneOfHanweir.java b/Mage.Sets/src/mage/cards/b/BaneOfHanweir.java index 6bdbe808a27..dc482c1516e 100644 --- a/Mage.Sets/src/mage/cards/b/BaneOfHanweir.java +++ b/Mage.Sets/src/mage/cards/b/BaneOfHanweir.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.AttacksEachTurnStaticAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BaneOfProgress.java b/Mage.Sets/src/mage/cards/b/BaneOfProgress.java index d677a6855ff..652f9e182cc 100644 --- a/Mage.Sets/src/mage/cards/b/BaneOfProgress.java +++ b/Mage.Sets/src/mage/cards/b/BaneOfProgress.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java b/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java index fe119fd0329..ed8170bd7e3 100644 --- a/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java +++ b/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Banefire.java b/Mage.Sets/src/mage/cards/b/Banefire.java index 78591b6d831..691d6aa2605 100644 --- a/Mage.Sets/src/mage/cards/b/Banefire.java +++ b/Mage.Sets/src/mage/cards/b/Banefire.java @@ -37,7 +37,10 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage.Sets/src/mage/cards/b/BaneslayerAngel.java b/Mage.Sets/src/mage/cards/b/BaneslayerAngel.java index c03cb72e1a8..a7cfa0f1e6f 100644 --- a/Mage.Sets/src/mage/cards/b/BaneslayerAngel.java +++ b/Mage.Sets/src/mage/cards/b/BaneslayerAngel.java @@ -28,8 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; @@ -37,11 +35,14 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BanewaspAffliction.java b/Mage.Sets/src/mage/cards/b/BanewaspAffliction.java index da9e0737d54..5b021c1407b 100644 --- a/Mage.Sets/src/mage/cards/b/BanewaspAffliction.java +++ b/Mage.Sets/src/mage/cards/b/BanewaspAffliction.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BanisherPriest.java b/Mage.Sets/src/mage/cards/b/BanisherPriest.java index 6f170c9c146..a39c22b763f 100644 --- a/Mage.Sets/src/mage/cards/b/BanisherPriest.java +++ b/Mage.Sets/src/mage/cards/b/BanisherPriest.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author jeffwadsworth using LevelX2 tech diff --git a/Mage.Sets/src/mage/cards/b/BanishingKnack.java b/Mage.Sets/src/mage/cards/b/BanishingKnack.java index 1aa404a5f1a..d03676d9d41 100644 --- a/Mage.Sets/src/mage/cards/b/BanishingKnack.java +++ b/Mage.Sets/src/mage/cards/b/BanishingKnack.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,6 +34,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; @@ -44,6 +42,8 @@ import mage.filter.common.FilterNonlandPermanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BanishingLight.java b/Mage.Sets/src/mage/cards/b/BanishingLight.java index abad2ea7c26..6f5ea1e5f4c 100644 --- a/Mage.Sets/src/mage/cards/b/BanishingLight.java +++ b/Mage.Sets/src/mage/cards/b/BanishingLight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BanishingStroke.java b/Mage.Sets/src/mage/cards/b/BanishingStroke.java index a44aa9572f2..8a1d719cf8d 100644 --- a/Mage.Sets/src/mage/cards/b/BanishingStroke.java +++ b/Mage.Sets/src/mage/cards/b/BanishingStroke.java @@ -27,12 +27,12 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.MiracleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage.Sets/src/mage/cards/b/BanishmentDecree.java b/Mage.Sets/src/mage/cards/b/BanishmentDecree.java index 48129a17a20..bc7a0c0eca8 100644 --- a/Mage.Sets/src/mage/cards/b/BanishmentDecree.java +++ b/Mage.Sets/src/mage/cards/b/BanishmentDecree.java @@ -28,16 +28,17 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BannersRaised.java b/Mage.Sets/src/mage/cards/b/BannersRaised.java index 41f6ea770b0..f1582bbfe1b 100644 --- a/Mage.Sets/src/mage/cards/b/BannersRaised.java +++ b/Mage.Sets/src/mage/cards/b/BannersRaised.java @@ -27,14 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BansheeOfTheDreadChoir.java b/Mage.Sets/src/mage/cards/b/BansheeOfTheDreadChoir.java index 46d418d5f0e..fcdade0ce53 100644 --- a/Mage.Sets/src/mage/cards/b/BansheeOfTheDreadChoir.java +++ b/Mage.Sets/src/mage/cards/b/BansheeOfTheDreadChoir.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BansheesBlade.java b/Mage.Sets/src/mage/cards/b/BansheesBlade.java index 366324a3cbf..48fd38c929d 100644 --- a/Mage.Sets/src/mage/cards/b/BansheesBlade.java +++ b/Mage.Sets/src/mage/cards/b/BansheesBlade.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -47,6 +46,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BantBattlemage.java b/Mage.Sets/src/mage/cards/b/BantBattlemage.java index 6eb06b00517..d0c600f9c1a 100644 --- a/Mage.Sets/src/mage/cards/b/BantBattlemage.java +++ b/Mage.Sets/src/mage/cards/b/BantBattlemage.java @@ -28,10 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,8 +38,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BantCharm.java b/Mage.Sets/src/mage/cards/b/BantCharm.java index 623a63a060a..007974e84fa 100644 --- a/Mage.Sets/src/mage/cards/b/BantCharm.java +++ b/Mage.Sets/src/mage/cards/b/BantCharm.java @@ -27,20 +27,21 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BantPanorama.java b/Mage.Sets/src/mage/cards/b/BantPanorama.java index aa3b6584e39..be57dd522d9 100644 --- a/Mage.Sets/src/mage/cards/b/BantPanorama.java +++ b/Mage.Sets/src/mage/cards/b/BantPanorama.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BantSojourners.java b/Mage.Sets/src/mage/cards/b/BantSojourners.java index 81118e7f555..69015071f89 100644 --- a/Mage.Sets/src/mage/cards/b/BantSojourners.java +++ b/Mage.Sets/src/mage/cards/b/BantSojourners.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.SoldierToken; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BantSureblade.java b/Mage.Sets/src/mage/cards/b/BantSureblade.java index 58c95938667..7cb06f85f5f 100644 --- a/Mage.Sets/src/mage/cards/b/BantSureblade.java +++ b/Mage.Sets/src/mage/cards/b/BantSureblade.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BanthaHerd.java b/Mage.Sets/src/mage/cards/b/BanthaHerd.java index 59da956a40c..4c994d8d7c2 100644 --- a/Mage.Sets/src/mage/cards/b/BanthaHerd.java +++ b/Mage.Sets/src/mage/cards/b/BanthaHerd.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BarTheDoor.java b/Mage.Sets/src/mage/cards/b/BarTheDoor.java index 005e8758532..011937eaf66 100644 --- a/Mage.Sets/src/mage/cards/b/BarTheDoor.java +++ b/Mage.Sets/src/mage/cards/b/BarTheDoor.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java b/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java index c314cb69d42..b56bc301b9c 100644 --- a/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java +++ b/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SpellCounteredControllerTriggeredAbility; @@ -36,11 +35,14 @@ import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -59,7 +61,7 @@ public class BaralChiefOfCompliance extends CardImpl { public BaralChiefOfCompliance(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/b/BaralsExpertise.java b/Mage.Sets/src/mage/cards/b/BaralsExpertise.java index 67c40d1053e..4e4b5cdd634 100644 --- a/Mage.Sets/src/mage/cards/b/BaralsExpertise.java +++ b/Mage.Sets/src/mage/cards/b/BaralsExpertise.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.cost.CastWithoutPayingManaCostEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BarbarianGeneral.java b/Mage.Sets/src/mage/cards/b/BarbarianGeneral.java index b7eecd63eb6..cf984788f88 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianGeneral.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianGeneral.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BarbarianHorde.java b/Mage.Sets/src/mage/cards/b/BarbarianHorde.java index 3651033a04a..31229c50b2d 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianHorde.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianHorde.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BarbarianLunatic.java b/Mage.Sets/src/mage/cards/b/BarbarianLunatic.java index 085c0ea7225..c65cd353a52 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianLunatic.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianLunatic.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BarbarianOutcast.java b/Mage.Sets/src/mage/cards/b/BarbarianOutcast.java index bf288d0c640..e377496dbb0 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianOutcast.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianOutcast.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java b/Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java index 27312d9e7fe..fdc24b28bc2 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianRiftcutter.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,13 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BarbarianRing.java b/Mage.Sets/src/mage/cards/b/BarbarianRing.java index 0ef0fb41e17..ef739ab0bbf 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianRing.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianRing.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.SacrificeSourceCost; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BarbaryApes.java b/Mage.Sets/src/mage/cards/b/BarbaryApes.java index 9c692a0a93f..5a7c457819c 100644 --- a/Mage.Sets/src/mage/cards/b/BarbaryApes.java +++ b/Mage.Sets/src/mage/cards/b/BarbaryApes.java @@ -27,11 +27,12 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BarbedBackWurm.java b/Mage.Sets/src/mage/cards/b/BarbedBackWurm.java index 026b6c958b8..5df9513989b 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedBackWurm.java +++ b/Mage.Sets/src/mage/cards/b/BarbedBackWurm.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java b/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java index 676a8bdba95..6ca50c3d789 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java +++ b/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java @@ -28,17 +28,17 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; 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.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BarbedField.java b/Mage.Sets/src/mage/cards/b/BarbedField.java index b09c2f69a68..e20dacd804d 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedField.java +++ b/Mage.Sets/src/mage/cards/b/BarbedField.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BarbedLightning.java b/Mage.Sets/src/mage/cards/b/BarbedLightning.java index 47098866f42..cd18bdb0634 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedLightning.java +++ b/Mage.Sets/src/mage/cards/b/BarbedLightning.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.EntwineAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BarbedSextant.java b/Mage.Sets/src/mage/cards/b/BarbedSextant.java index b3eac60f1c6..bcfab2506f3 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedSextant.java +++ b/Mage.Sets/src/mage/cards/b/BarbedSextant.java @@ -27,20 +27,21 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.ActivatedManaAbilityImpl; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BarbedShocker.java b/Mage.Sets/src/mage/cards/b/BarbedShocker.java index bcbf30fc0fa..c21f310b002 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedShocker.java +++ b/Mage.Sets/src/mage/cards/b/BarbedShocker.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author markedagain diff --git a/Mage.Sets/src/mage/cards/b/BarbedSliver.java b/Mage.Sets/src/mage/cards/b/BarbedSliver.java index 55ac72c06e5..16c0dc403ec 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedSliver.java +++ b/Mage.Sets/src/mage/cards/b/BarbedSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BarbtoothWurm.java b/Mage.Sets/src/mage/cards/b/BarbtoothWurm.java index 15a9f39b116..4bf792358de 100644 --- a/Mage.Sets/src/mage/cards/b/BarbtoothWurm.java +++ b/Mage.Sets/src/mage/cards/b/BarbtoothWurm.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/Bargain.java b/Mage.Sets/src/mage/cards/b/Bargain.java index 1a3eb4efa8b..96ddbce1c18 100644 --- a/Mage.Sets/src/mage/cards/b/Bargain.java +++ b/Mage.Sets/src/mage/cards/b/Bargain.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BarkhideMauler.java b/Mage.Sets/src/mage/cards/b/BarkhideMauler.java index 3de0a259e1d..59827be3e01 100644 --- a/Mage.Sets/src/mage/cards/b/BarkhideMauler.java +++ b/Mage.Sets/src/mage/cards/b/BarkhideMauler.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BarkshellBlessing.java b/Mage.Sets/src/mage/cards/b/BarkshellBlessing.java index 348aabe820e..1bec85a97bc 100644 --- a/Mage.Sets/src/mage/cards/b/BarkshellBlessing.java +++ b/Mage.Sets/src/mage/cards/b/BarkshellBlessing.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.ConspireAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BarktoothWarbeard.java b/Mage.Sets/src/mage/cards/b/BarktoothWarbeard.java index 3d212e7ee53..90d51a1bf21 100644 --- a/Mage.Sets/src/mage/cards/b/BarktoothWarbeard.java +++ b/Mage.Sets/src/mage/cards/b/BarktoothWarbeard.java @@ -27,11 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class BarktoothWarbeard extends CardImpl { public BarktoothWarbeard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/b/BarlsCage.java b/Mage.Sets/src/mage/cards/b/BarlsCage.java index c92f2613a6b..a22bed1c1a2 100644 --- a/Mage.Sets/src/mage/cards/b/BarlsCage.java +++ b/Mage.Sets/src/mage/cards/b/BarlsCage.java @@ -27,17 +27,18 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; -import mage.constants.CardType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Backfir3 */ diff --git a/Mage.Sets/src/mage/cards/b/BaronSengir.java b/Mage.Sets/src/mage/cards/b/BaronSengir.java index 5fcaa90fcc0..bee4ca06eec 100644 --- a/Mage.Sets/src/mage/cards/b/BaronSengir.java +++ b/Mage.Sets/src/mage/cards/b/BaronSengir.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -46,6 +46,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -61,7 +63,7 @@ public class BaronSengir extends CardImpl { public BaronSengir(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/b/BaronyVampire.java b/Mage.Sets/src/mage/cards/b/BaronyVampire.java index e5fd87c4712..06436b53d60 100644 --- a/Mage.Sets/src/mage/cards/b/BaronyVampire.java +++ b/Mage.Sets/src/mage/cards/b/BaronyVampire.java @@ -28,11 +28,12 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java b/Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java index 3b9f6ad0760..2e4e6c1d15f 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.decorator.ConditionalRestrictionEffect; @@ -42,6 +41,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java b/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java index 3cc1db9f0c9..cbc4270d65a 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BarrageOgre.java b/Mage.Sets/src/mage/cards/b/BarrageOgre.java index 3921312b8b6..b1c4337ce8c 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOgre.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOgre.java @@ -28,8 +28,6 @@ package mage.cards.b; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +36,8 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java index 44c470a4bc5..6b5bb142399 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BarrelDownSokenzan.java b/Mage.Sets/src/mage/cards/b/BarrelDownSokenzan.java index 0b633049e5e..f03adc21b55 100644 --- a/Mage.Sets/src/mage/cards/b/BarrelDownSokenzan.java +++ b/Mage.Sets/src/mage/cards/b/BarrelDownSokenzan.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.SweepNumber; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BarrenGlory.java b/Mage.Sets/src/mage/cards/b/BarrenGlory.java index cb712fe77a8..9237bc17d62 100644 --- a/Mage.Sets/src/mage/cards/b/BarrenGlory.java +++ b/Mage.Sets/src/mage/cards/b/BarrenGlory.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -46,6 +44,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * @author fireshoes */ diff --git a/Mage.Sets/src/mage/cards/b/BarrenMoor.java b/Mage.Sets/src/mage/cards/b/BarrenMoor.java index 14815b4782f..b32df7811ef 100644 --- a/Mage.Sets/src/mage/cards/b/BarrenMoor.java +++ b/Mage.Sets/src/mage/cards/b/BarrenMoor.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BarrentonCragtreads.java b/Mage.Sets/src/mage/cards/b/BarrentonCragtreads.java index 82e26b54f74..a5a9f854d35 100644 --- a/Mage.Sets/src/mage/cards/b/BarrentonCragtreads.java +++ b/Mage.Sets/src/mage/cards/b/BarrentonCragtreads.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleEvasionAbility; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BarrentonMedic.java b/Mage.Sets/src/mage/cards/b/BarrentonMedic.java index d6907bd891d..33b076fe31b 100644 --- a/Mage.Sets/src/mage/cards/b/BarrentonMedic.java +++ b/Mage.Sets/src/mage/cards/b/BarrentonMedic.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BarricadeBreaker.java b/Mage.Sets/src/mage/cards/b/BarricadeBreaker.java index d47ef28caea..0a47c5ce3e7 100644 --- a/Mage.Sets/src/mage/cards/b/BarricadeBreaker.java +++ b/Mage.Sets/src/mage/cards/b/BarricadeBreaker.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.ImproviseAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java b/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java index 9c670a600bb..242af98c769 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java +++ b/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,9 +34,14 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 @@ -48,7 +50,7 @@ public class BarrinMasterWizard extends CardImpl { public BarrinMasterWizard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/b/BarrinsCodex.java b/Mage.Sets/src/mage/cards/b/BarrinsCodex.java index bd37281f6b1..1ab47af453d 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinsCodex.java +++ b/Mage.Sets/src/mage/cards/b/BarrinsCodex.java @@ -27,24 +27,24 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.dynamicvalue.common.CountersSourceCount; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BarrowGhoul.java b/Mage.Sets/src/mage/cards/b/BarrowGhoul.java index 1b020a070e9..0895b8a04f0 100644 --- a/Mage.Sets/src/mage/cards/b/BarrowGhoul.java +++ b/Mage.Sets/src/mage/cards/b/BarrowGhoul.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.ExileTopCreatureCardOfGraveyardCost; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java b/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java index 03be0ceb3d0..9c4c7ed34bd 100644 --- a/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java +++ b/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,15 +34,14 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; +import java.util.UUID; + /** * * @author JRHerlehy @@ -52,7 +50,7 @@ public class BartelRuneaxe extends CardImpl { public BartelRuneaxe(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Giant"); this.subtype.add("Warrior"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/b/BarterInBlood.java b/Mage.Sets/src/mage/cards/b/BarterInBlood.java index 688bb45002c..db07d14a960 100644 --- a/Mage.Sets/src/mage/cards/b/BarterInBlood.java +++ b/Mage.Sets/src/mage/cards/b/BarterInBlood.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java index 4c2249081b3..2deff0a3b51 100644 --- a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,10 +38,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -53,6 +49,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author emerald000 @@ -70,7 +68,7 @@ public class BaruFistOfKrosa extends CardImpl { public BaruFistOfKrosa(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/cards/b/BasalSliver.java b/Mage.Sets/src/mage/cards/b/BasalSliver.java index 7b54a35c4d5..b074ccf76c4 100644 --- a/Mage.Sets/src/mage/cards/b/BasalSliver.java +++ b/Mage.Sets/src/mage/cards/b/BasalSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/b/BasalThrull.java b/Mage.Sets/src/mage/cards/b/BasalThrull.java index 2af03ae819b..45aad0f7183 100644 --- a/Mage.Sets/src/mage/cards/b/BasalThrull.java +++ b/Mage.Sets/src/mage/cards/b/BasalThrull.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BasaltGargoyle.java b/Mage.Sets/src/mage/cards/b/BasaltGargoyle.java index c4e8e71592d..8417e7a863a 100644 --- a/Mage.Sets/src/mage/cards/b/BasaltGargoyle.java +++ b/Mage.Sets/src/mage/cards/b/BasaltGargoyle.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BasaltMonolith.java b/Mage.Sets/src/mage/cards/b/BasaltMonolith.java index 0d55b96e071..fa9735f03f7 100644 --- a/Mage.Sets/src/mage/cards/b/BasaltMonolith.java +++ b/Mage.Sets/src/mage/cards/b/BasaltMonolith.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java b/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java index 92e3435f59b..ede2bca5d53 100644 --- a/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java +++ b/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,15 +39,13 @@ import mage.abilities.keyword.AttacksThisTurnMarkerAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TurnPhase; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -57,7 +54,7 @@ public class BasandraBattleSeraph extends CardImpl { public BasandraBattleSeraph(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/b/BashToBits.java b/Mage.Sets/src/mage/cards/b/BashToBits.java index 47d9315bace..25207f34a8d 100644 --- a/Mage.Sets/src/mage/cards/b/BashToBits.java +++ b/Mage.Sets/src/mage/cards/b/BashToBits.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlashbackAbility; @@ -38,6 +37,8 @@ import mage.constants.TimingRule; import mage.target.Target; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BasilicaGuards.java b/Mage.Sets/src/mage/cards/b/BasilicaGuards.java index 61188ef9ff2..d06cc50c17c 100644 --- a/Mage.Sets/src/mage/cards/b/BasilicaGuards.java +++ b/Mage.Sets/src/mage/cards/b/BasilicaGuards.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ExtortAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BasilicaScreecher.java b/Mage.Sets/src/mage/cards/b/BasilicaScreecher.java index d161b1467f1..0c382b91077 100644 --- a/Mage.Sets/src/mage/cards/b/BasilicaScreecher.java +++ b/Mage.Sets/src/mage/cards/b/BasilicaScreecher.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ExtortAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BasiliskCollar.java b/Mage.Sets/src/mage/cards/b/BasiliskCollar.java index cfcc35c3353..93dd763614e 100644 --- a/Mage.Sets/src/mage/cards/b/BasiliskCollar.java +++ b/Mage.Sets/src/mage/cards/b/BasiliskCollar.java @@ -28,11 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -42,6 +37,11 @@ import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BaskingRootwalla.java b/Mage.Sets/src/mage/cards/b/BaskingRootwalla.java index 5f65a64c0d1..21ebafd56c9 100644 --- a/Mage.Sets/src/mage/cards/b/BaskingRootwalla.java +++ b/Mage.Sets/src/mage/cards/b/BaskingRootwalla.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/cards/b/BassaraTowerArcher.java b/Mage.Sets/src/mage/cards/b/BassaraTowerArcher.java index 8e93bf03132..daae7485acd 100644 --- a/Mage.Sets/src/mage/cards/b/BassaraTowerArcher.java +++ b/Mage.Sets/src/mage/cards/b/BassaraTowerArcher.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.abilities.keyword.ReachAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BastionEnforcer.java b/Mage.Sets/src/mage/cards/b/BastionEnforcer.java index 4890d9de2cc..4f215fb2dd4 100644 --- a/Mage.Sets/src/mage/cards/b/BastionEnforcer.java +++ b/Mage.Sets/src/mage/cards/b/BastionEnforcer.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BastionInventor.java b/Mage.Sets/src/mage/cards/b/BastionInventor.java index 0bca7c1cebc..84dc0f51617 100644 --- a/Mage.Sets/src/mage/cards/b/BastionInventor.java +++ b/Mage.Sets/src/mage/cards/b/BastionInventor.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.ImproviseAbility; import mage.abilities.keyword.HexproofAbility; +import mage.abilities.keyword.ImproviseAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/b/BastionMastodon.java b/Mage.Sets/src/mage/cards/b/BastionMastodon.java index e7b06d259e0..c224b71b2d1 100644 --- a/Mage.Sets/src/mage/cards/b/BastionMastodon.java +++ b/Mage.Sets/src/mage/cards/b/BastionMastodon.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/b/BastionProtector.java b/Mage.Sets/src/mage/cards/b/BastionProtector.java index 1ed1cc6724f..0a03f9d698c 100644 --- a/Mage.Sets/src/mage/cards/b/BastionProtector.java +++ b/Mage.Sets/src/mage/cards/b/BastionProtector.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.CommanderPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BatheInBacta.java b/Mage.Sets/src/mage/cards/b/BatheInBacta.java index 794aaca6446..2a5fac063ec 100644 --- a/Mage.Sets/src/mage/cards/b/BatheInBacta.java +++ b/Mage.Sets/src/mage/cards/b/BatheInBacta.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.HateCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.watchers.common.LifeLossOtherFromCombatWatcher; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BatheInDragonfire.java b/Mage.Sets/src/mage/cards/b/BatheInDragonfire.java index 092fdd474c1..bc5cd7e3d55 100644 --- a/Mage.Sets/src/mage/cards/b/BatheInDragonfire.java +++ b/Mage.Sets/src/mage/cards/b/BatheInDragonfire.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BatheInLight.java b/Mage.Sets/src/mage/cards/b/BatheInLight.java index ea9c1bf2530..1cd8d649bca 100644 --- a/Mage.Sets/src/mage/cards/b/BatheInLight.java +++ b/Mage.Sets/src/mage/cards/b/BatheInLight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BatonOfCourage.java b/Mage.Sets/src/mage/cards/b/BatonOfCourage.java index 66823f779ed..85adcbe6ab4 100644 --- a/Mage.Sets/src/mage/cards/b/BatonOfCourage.java +++ b/Mage.Sets/src/mage/cards/b/BatonOfCourage.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -38,11 +35,14 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BatteredGolem.java b/Mage.Sets/src/mage/cards/b/BatteredGolem.java index f247d67fe8e..1d6d29da962 100644 --- a/Mage.Sets/src/mage/cards/b/BatteredGolem.java +++ b/Mage.Sets/src/mage/cards/b/BatteredGolem.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/Batterhorn.java b/Mage.Sets/src/mage/cards/b/Batterhorn.java index 095542e1bcc..5146d4e07ff 100644 --- a/Mage.Sets/src/mage/cards/b/Batterhorn.java +++ b/Mage.Sets/src/mage/cards/b/Batterhorn.java @@ -28,16 +28,17 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java b/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java index 36fcd931da6..58960343e8a 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java +++ b/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BatteringKrasis.java b/Mage.Sets/src/mage/cards/b/BatteringKrasis.java index 6a171b826f8..0aa9adbfbbc 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringKrasis.java +++ b/Mage.Sets/src/mage/cards/b/BatteringKrasis.java @@ -28,13 +28,14 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BatteringSliver.java b/Mage.Sets/src/mage/cards/b/BatteringSliver.java index d9d03160841..d60a5a1a9de 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringSliver.java +++ b/Mage.Sets/src/mage/cards/b/BatteringSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/b/BatteringWurm.java b/Mage.Sets/src/mage/cards/b/BatteringWurm.java index 78ced09d4cf..fe3682939a2 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringWurm.java +++ b/Mage.Sets/src/mage/cards/b/BatteringWurm.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesWithLessPowerEffect; import mage.abilities.keyword.BloodthirstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Batterskull.java b/Mage.Sets/src/mage/cards/b/Batterskull.java index 1ae370c9177..9e3d65ed56b 100644 --- a/Mage.Sets/src/mage/cards/b/Batterskull.java +++ b/Mage.Sets/src/mage/cards/b/Batterskull.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -43,6 +40,12 @@ import mage.abilities.keyword.LivingWeaponAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BattleAtTheBridge.java b/Mage.Sets/src/mage/cards/b/BattleAtTheBridge.java index 6fa4797ebc5..02172cb411b 100644 --- a/Mage.Sets/src/mage/cards/b/BattleAtTheBridge.java +++ b/Mage.Sets/src/mage/cards/b/BattleAtTheBridge.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BattleBrawler.java b/Mage.Sets/src/mage/cards/b/BattleBrawler.java index 92cc1e14cb2..0110c7423db 100644 --- a/Mage.Sets/src/mage/cards/b/BattleBrawler.java +++ b/Mage.Sets/src/mage/cards/b/BattleBrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BattleFrenzy.java b/Mage.Sets/src/mage/cards/b/BattleFrenzy.java index 026c640fc7f..385b0263656 100644 --- a/Mage.Sets/src/mage/cards/b/BattleFrenzy.java +++ b/Mage.Sets/src/mage/cards/b/BattleFrenzy.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BattleHurda.java b/Mage.Sets/src/mage/cards/b/BattleHurda.java index e7755d4bfa7..f7373d7edff 100644 --- a/Mage.Sets/src/mage/cards/b/BattleHurda.java +++ b/Mage.Sets/src/mage/cards/b/BattleHurda.java @@ -28,12 +28,13 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BattleHymn.java b/Mage.Sets/src/mage/cards/b/BattleHymn.java index aeb1241432d..cbf93dcbd4e 100644 --- a/Mage.Sets/src/mage/cards/b/BattleHymn.java +++ b/Mage.Sets/src/mage/cards/b/BattleHymn.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DynamicManaEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BattleMadRonin.java b/Mage.Sets/src/mage/cards/b/BattleMadRonin.java index d8ef3af3454..711a2d14c9a 100644 --- a/Mage.Sets/src/mage/cards/b/BattleMadRonin.java +++ b/Mage.Sets/src/mage/cards/b/BattleMadRonin.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.BushidoAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author loki diff --git a/Mage.Sets/src/mage/cards/b/BattleMastery.java b/Mage.Sets/src/mage/cards/b/BattleMastery.java index ef3e04c016b..2ec1d6e2b8f 100644 --- a/Mage.Sets/src/mage/cards/b/BattleMastery.java +++ b/Mage.Sets/src/mage/cards/b/BattleMastery.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -36,6 +35,10 @@ import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/b/BattleOfWits.java b/Mage.Sets/src/mage/cards/b/BattleOfWits.java index ee0098738b8..3f165a631a0 100644 --- a/Mage.Sets/src/mage/cards/b/BattleOfWits.java +++ b/Mage.Sets/src/mage/cards/b/BattleOfWits.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,9 +35,13 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.WinGameSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BattleRampart.java b/Mage.Sets/src/mage/cards/b/BattleRampart.java index 67bf244bd9f..b133a7c8241 100644 --- a/Mage.Sets/src/mage/cards/b/BattleRampart.java +++ b/Mage.Sets/src/mage/cards/b/BattleRampart.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,8 +35,13 @@ import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BattleRattleShaman.java b/Mage.Sets/src/mage/cards/b/BattleRattleShaman.java index 60df9b6bc43..c4194ee836c 100644 --- a/Mage.Sets/src/mage/cards/b/BattleRattleShaman.java +++ b/Mage.Sets/src/mage/cards/b/BattleRattleShaman.java @@ -27,17 +27,20 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BattleScreech.java b/Mage.Sets/src/mage/cards/b/BattleScreech.java index 08de2297ae6..f84cc5f8952 100644 --- a/Mage.Sets/src/mage/cards/b/BattleScreech.java +++ b/Mage.Sets/src/mage/cards/b/BattleScreech.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.CreateTokenEffect; @@ -43,6 +42,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.BirdToken; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BattleSliver.java b/Mage.Sets/src/mage/cards/b/BattleSliver.java index 4d7556ccb18..ef0cf7c3259 100644 --- a/Mage.Sets/src/mage/cards/b/BattleSliver.java +++ b/Mage.Sets/src/mage/cards/b/BattleSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BattleSquadron.java b/Mage.Sets/src/mage/cards/b/BattleSquadron.java index 0545d70c89e..e0a6236e08e 100644 --- a/Mage.Sets/src/mage/cards/b/BattleSquadron.java +++ b/Mage.Sets/src/mage/cards/b/BattleSquadron.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BattleStrain.java b/Mage.Sets/src/mage/cards/b/BattleStrain.java index a12f8e970ed..b4599d1deda 100644 --- a/Mage.Sets/src/mage/cards/b/BattleStrain.java +++ b/Mage.Sets/src/mage/cards/b/BattleStrain.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BattleTactics.java b/Mage.Sets/src/mage/cards/b/BattleTactics.java index a8006e72388..e24cf34225f 100644 --- a/Mage.Sets/src/mage/cards/b/BattleTactics.java +++ b/Mage.Sets/src/mage/cards/b/BattleTactics.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldForge.java b/Mage.Sets/src/mage/cards/b/BattlefieldForge.java index 3d090aba3a8..facd7dd44ff 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldForge.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldForge.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldPercher.java b/Mage.Sets/src/mage/cards/b/BattlefieldPercher.java index c3dd5e4b60f..c8367d83472 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldPercher.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldPercher.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldScrounger.java b/Mage.Sets/src/mage/cards/b/BattlefieldScrounger.java index 3b018f1a620..0d0ba94502f 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldScrounger.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldScrounger.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -38,16 +37,14 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java b/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java index d2d8c800404..a635efd686f 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java @@ -27,24 +27,17 @@ */ package mage.cards.b; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.HeroicAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -54,6 +47,10 @@ import mage.game.stack.Spell; import mage.target.Target; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BattleflightEagle.java b/Mage.Sets/src/mage/cards/b/BattleflightEagle.java index 52e977ba6c5..ceee1f9eaef 100644 --- a/Mage.Sets/src/mage/cards/b/BattleflightEagle.java +++ b/Mage.Sets/src/mage/cards/b/BattleflightEagle.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java index 8248bc90d0c..2eddaea783b 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java +++ b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedByMoreThanOneAllEffect; @@ -40,6 +39,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BattlegateMimic.java b/Mage.Sets/src/mage/cards/b/BattlegateMimic.java index 5c44a235135..293a0eaa900 100644 --- a/Mage.Sets/src/mage/cards/b/BattlegateMimic.java +++ b/Mage.Sets/src/mage/cards/b/BattlegateMimic.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +42,8 @@ import mage.constants.SubLayer; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BattlegraceAngel.java b/Mage.Sets/src/mage/cards/b/BattlegraceAngel.java index 01169cd4bfe..fe9616f5bdc 100644 --- a/Mage.Sets/src/mage/cards/b/BattlegraceAngel.java +++ b/Mage.Sets/src/mage/cards/b/BattlegraceAngel.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java b/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java index eac4a719384..5cb4cd49725 100644 --- a/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java +++ b/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java @@ -27,13 +27,13 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/b/Battlegrowth.java b/Mage.Sets/src/mage/cards/b/Battlegrowth.java index c0a3ffca7cf..e4dd7da0358 100644 --- a/Mage.Sets/src/mage/cards/b/Battlegrowth.java +++ b/Mage.Sets/src/mage/cards/b/Battlegrowth.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java b/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java index 2f728555792..133671858e4 100644 --- a/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java +++ b/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BattlewandOak.java b/Mage.Sets/src/mage/cards/b/BattlewandOak.java index 0ab0860d9d4..c64455a2a2c 100644 --- a/Mage.Sets/src/mage/cards/b/BattlewandOak.java +++ b/Mage.Sets/src/mage/cards/b/BattlewandOak.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -40,6 +39,8 @@ import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BattlewiseAven.java b/Mage.Sets/src/mage/cards/b/BattlewiseAven.java index 13ed27ee006..b1da80a32f9 100644 --- a/Mage.Sets/src/mage/cards/b/BattlewiseAven.java +++ b/Mage.Sets/src/mage/cards/b/BattlewiseAven.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BattlewiseHoplite.java b/Mage.Sets/src/mage/cards/b/BattlewiseHoplite.java index acec52373ef..5da81a92310 100644 --- a/Mage.Sets/src/mage/cards/b/BattlewiseHoplite.java +++ b/Mage.Sets/src/mage/cards/b/BattlewiseHoplite.java @@ -27,17 +27,18 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BattlewiseValor.java b/Mage.Sets/src/mage/cards/b/BattlewiseValor.java index 653134f8c11..dd86dc3a8f0 100644 --- a/Mage.Sets/src/mage/cards/b/BattlewiseValor.java +++ b/Mage.Sets/src/mage/cards/b/BattlewiseValor.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BatwingBrume.java b/Mage.Sets/src/mage/cards/b/BatwingBrume.java index 98b0ed45eea..0c16d9a364c 100644 --- a/Mage.Sets/src/mage/cards/b/BatwingBrume.java +++ b/Mage.Sets/src/mage/cards/b/BatwingBrume.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.ManaWasSpentCondition; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.players.Player; import mage.watchers.common.ManaSpentToCastWatcher; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BayFalcon.java b/Mage.Sets/src/mage/cards/b/BayFalcon.java index cb1db53aea9..f5bea54d4bd 100644 --- a/Mage.Sets/src/mage/cards/b/BayFalcon.java +++ b/Mage.Sets/src/mage/cards/b/BayFalcon.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Bayou.java b/Mage.Sets/src/mage/cards/b/Bayou.java index a6b1974a202..e9267f4f3c1 100644 --- a/Mage.Sets/src/mage/cards/b/Bayou.java +++ b/Mage.Sets/src/mage/cards/b/Bayou.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BayouDragonfly.java b/Mage.Sets/src/mage/cards/b/BayouDragonfly.java index 85c5b9a7522..cc9c063570c 100644 --- a/Mage.Sets/src/mage/cards/b/BayouDragonfly.java +++ b/Mage.Sets/src/mage/cards/b/BayouDragonfly.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BazaarKrovod.java b/Mage.Sets/src/mage/cards/b/BazaarKrovod.java index 301f3741c0a..0e20424a68e 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarKrovod.java +++ b/Mage.Sets/src/mage/cards/b/BazaarKrovod.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -37,6 +34,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterAttackingCreature; @@ -45,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java b/Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java index 89ab0e58290..fce9d53223c 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java +++ b/Mage.Sets/src/mage/cards/b/BazaarOfBaghdad.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawDiscardControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BazaarTrader.java b/Mage.Sets/src/mage/cards/b/BazaarTrader.java index 0cb698d25c5..2372f67003f 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarTrader.java +++ b/Mage.Sets/src/mage/cards/b/BazaarTrader.java @@ -27,13 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -42,6 +35,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -51,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BeaconBehemoth.java b/Mage.Sets/src/mage/cards/b/BeaconBehemoth.java index 05643690433..450f417ba1a 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconBehemoth.java +++ b/Mage.Sets/src/mage/cards/b/BeaconBehemoth.java @@ -28,10 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,11 +36,16 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BeaconHawk.java b/Mage.Sets/src/mage/cards/b/BeaconHawk.java index d6db2ae7d45..3b7860c0196 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconHawk.java +++ b/Mage.Sets/src/mage/cards/b/BeaconHawk.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,8 +37,14 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java b/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java index a69f6b25051..8b990c11b15 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ShuffleSpellEffect; @@ -38,6 +37,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.InsectToken; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfDestruction.java b/Mage.Sets/src/mage/cards/b/BeaconOfDestruction.java index 9181c51d463..d8776818181 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfDestruction.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfDestruction.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfImmortality.java b/Mage.Sets/src/mage/cards/b/BeaconOfImmortality.java index aa5af199c3c..b7e956249c3 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfImmortality.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfImmortality.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfTomorrows.java b/Mage.Sets/src/mage/cards/b/BeaconOfTomorrows.java index 1a0f93cb058..7b1bb1c825e 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfTomorrows.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfTomorrows.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.game.turn.TurnMod; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfUnrest.java b/Mage.Sets/src/mage/cards/b/BeaconOfUnrest.java index bb76c611b59..8effaa852ef 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfUnrest.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfUnrest.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BearCub.java b/Mage.Sets/src/mage/cards/b/BearCub.java index b8a58e5feff..3ab0152940e 100644 --- a/Mage.Sets/src/mage/cards/b/BearCub.java +++ b/Mage.Sets/src/mage/cards/b/BearCub.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BearUmbra.java b/Mage.Sets/src/mage/cards/b/BearUmbra.java index 075d675f288..6b6eedcbd6c 100644 --- a/Mage.Sets/src/mage/cards/b/BearUmbra.java +++ b/Mage.Sets/src/mage/cards/b/BearUmbra.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,9 +38,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TotemArmorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BearerOfOverwhelmingTruths.java b/Mage.Sets/src/mage/cards/b/BearerOfOverwhelmingTruths.java index 4d7a58f0221..7007f0fa7a2 100644 --- a/Mage.Sets/src/mage/cards/b/BearerOfOverwhelmingTruths.java +++ b/Mage.Sets/src/mage/cards/b/BearerOfOverwhelmingTruths.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.keyword.InvestigateEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BearerOfSilence.java b/Mage.Sets/src/mage/cards/b/BearerOfSilence.java index 2b7bbd99d58..c55e8f3425c 100644 --- a/Mage.Sets/src/mage/cards/b/BearerOfSilence.java +++ b/Mage.Sets/src/mage/cards/b/BearerOfSilence.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BearerOfTheHeavens.java b/Mage.Sets/src/mage/cards/b/BearerOfTheHeavens.java index 48b290a3bde..20e50a18ebb 100644 --- a/Mage.Sets/src/mage/cards/b/BearerOfTheHeavens.java +++ b/Mage.Sets/src/mage/cards/b/BearerOfTheHeavens.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BearsCompanion.java b/Mage.Sets/src/mage/cards/b/BearsCompanion.java index e93fd7d5bbc..1ce849891d1 100644 --- a/Mage.Sets/src/mage/cards/b/BearsCompanion.java +++ b/Mage.Sets/src/mage/cards/b/BearsCompanion.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Bearscape.java b/Mage.Sets/src/mage/cards/b/Bearscape.java index 1c32c4c27fa..22a4ceb7ed0 100644 --- a/Mage.Sets/src/mage/cards/b/Bearscape.java +++ b/Mage.Sets/src/mage/cards/b/Bearscape.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileFromGraveCost; @@ -41,6 +40,8 @@ import mage.filter.FilterCard; import mage.game.permanent.token.BearToken; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BeastAttack.java b/Mage.Sets/src/mage/cards/b/BeastAttack.java index 953e8d526f2..7429bc2650b 100644 --- a/Mage.Sets/src/mage/cards/b/BeastAttack.java +++ b/Mage.Sets/src/mage/cards/b/BeastAttack.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.game.permanent.token.BeastToken2; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/b/BeastHunt.java b/Mage.Sets/src/mage/cards/b/BeastHunt.java index f3d8760c883..e97ec0423cf 100644 --- a/Mage.Sets/src/mage/cards/b/BeastHunt.java +++ b/Mage.Sets/src/mage/cards/b/BeastHunt.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BeastOfBurden.java b/Mage.Sets/src/mage/cards/b/BeastOfBurden.java index 2f280b1d53d..f6044d5abcb 100644 --- a/Mage.Sets/src/mage/cards/b/BeastOfBurden.java +++ b/Mage.Sets/src/mage/cards/b/BeastOfBurden.java @@ -27,19 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BeastWithin.java b/Mage.Sets/src/mage/cards/b/BeastWithin.java index 09e3901cefc..66f80adcbbc 100644 --- a/Mage.Sets/src/mage/cards/b/BeastWithin.java +++ b/Mage.Sets/src/mage/cards/b/BeastWithin.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.BeastToken; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author North, Loki diff --git a/Mage.Sets/src/mage/cards/b/BeastcallerSavant.java b/Mage.Sets/src/mage/cards/b/BeastcallerSavant.java index 8b44a2e5ef1..e9fd60e6981 100644 --- a/Mage.Sets/src/mage/cards/b/BeastcallerSavant.java +++ b/Mage.Sets/src/mage/cards/b/BeastcallerSavant.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.mana.ConditionalAnyColorManaAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreatureSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java b/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java index b52b1671a93..cfb5a20b6e4 100644 --- a/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java @@ -28,9 +28,6 @@ package mage.cards.b; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +35,9 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java b/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java index 73c3c08523b..2d95a76d9fb 100644 --- a/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java +++ b/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,17 +38,15 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Markedagain diff --git a/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java b/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java index a0325fa9aff..96ba6f287ae 100644 --- a/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java +++ b/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TokenPredicate; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/b/BeckCall.java b/Mage.Sets/src/mage/cards/b/BeckCall.java index e25ff383791..23c405148de 100644 --- a/Mage.Sets/src/mage/cards/b/BeckCall.java +++ b/Mage.Sets/src/mage/cards/b/BeckCall.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.permanent.token.BirdToken; +import java.util.UUID; + public class BeckCall extends SplitCard { public BeckCall(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BeckonApparition.java b/Mage.Sets/src/mage/cards/b/BeckonApparition.java index c37b7ab78bb..fbb7975f9de 100644 --- a/Mage.Sets/src/mage/cards/b/BeckonApparition.java +++ b/Mage.Sets/src/mage/cards/b/BeckonApparition.java @@ -27,18 +27,18 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.Token; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BecomeImmense.java b/Mage.Sets/src/mage/cards/b/BecomeImmense.java index 3f60e9f9628..1a4f0be8485 100644 --- a/Mage.Sets/src/mage/cards/b/BecomeImmense.java +++ b/Mage.Sets/src/mage/cards/b/BecomeImmense.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.DelveAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Bedlam.java b/Mage.Sets/src/mage/cards/b/Bedlam.java index 2d7e9025c88..40a4cff4457 100644 --- a/Mage.Sets/src/mage/cards/b/Bedlam.java +++ b/Mage.Sets/src/mage/cards/b/Bedlam.java @@ -28,19 +28,19 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BedlamReveler.java b/Mage.Sets/src/mage/cards/b/BedlamReveler.java index da88611a9be..4a27b5141bd 100644 --- a/Mage.Sets/src/mage/cards/b/BedlamReveler.java +++ b/Mage.Sets/src/mage/cards/b/BedlamReveler.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -40,16 +39,14 @@ import mage.abilities.effects.common.discard.DiscardHandControllerEffect; import mage.abilities.keyword.ProwessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterInstantOrSorceryCard; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BeeSting.java b/Mage.Sets/src/mage/cards/b/BeeSting.java index 2fecd72824a..e86766d30d5 100644 --- a/Mage.Sets/src/mage/cards/b/BeeSting.java +++ b/Mage.Sets/src/mage/cards/b/BeeSting.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/b/BeetlebackChief.java b/Mage.Sets/src/mage/cards/b/BeetlebackChief.java index a23b2c500c9..84955827147 100644 --- a/Mage.Sets/src/mage/cards/b/BeetlebackChief.java +++ b/Mage.Sets/src/mage/cards/b/BeetlebackChief.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.GoblinToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BeetleformMage.java b/Mage.Sets/src/mage/cards/b/BeetleformMage.java index 4181eb3c5ee..d717db99303 100644 --- a/Mage.Sets/src/mage/cards/b/BeetleformMage.java +++ b/Mage.Sets/src/mage/cards/b/BeetleformMage.java @@ -28,10 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -41,6 +37,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Befoul.java b/Mage.Sets/src/mage/cards/b/Befoul.java index f493609f866..e3dfd748a71 100644 --- a/Mage.Sets/src/mage/cards/b/Befoul.java +++ b/Mage.Sets/src/mage/cards/b/Befoul.java @@ -29,19 +29,19 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java b/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java index da8fcb50f19..b10b115a549 100644 --- a/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java +++ b/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +34,9 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/b/BehemothSledge.java b/Mage.Sets/src/mage/cards/b/BehemothSledge.java index 0d18d9cdb3e..19314c0318c 100644 --- a/Mage.Sets/src/mage/cards/b/BehemothSledge.java +++ b/Mage.Sets/src/mage/cards/b/BehemothSledge.java @@ -28,11 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -43,6 +38,11 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** diff --git a/Mage.Sets/src/mage/cards/b/BehemothsHerald.java b/Mage.Sets/src/mage/cards/b/BehemothsHerald.java index 9c398ceadd5..2b6f3d92fcb 100644 --- a/Mage.Sets/src/mage/cards/b/BehemothsHerald.java +++ b/Mage.Sets/src/mage/cards/b/BehemothsHerald.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +37,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java index 857e16f42cd..7fde57f6345 100644 --- a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java +++ b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BeholdTheBeyond.java b/Mage.Sets/src/mage/cards/b/BeholdTheBeyond.java index b688c86744a..dc95b5898fc 100644 --- a/Mage.Sets/src/mage/cards/b/BeholdTheBeyond.java +++ b/Mage.Sets/src/mage/cards/b/BeholdTheBeyond.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.discard.DiscardHandControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BelbesPercher.java b/Mage.Sets/src/mage/cards/b/BelbesPercher.java index 27a8039fc87..925ab33d072 100644 --- a/Mage.Sets/src/mage/cards/b/BelbesPercher.java +++ b/Mage.Sets/src/mage/cards/b/BelbesPercher.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BelbesPortal.java b/Mage.Sets/src/mage/cards/b/BelbesPortal.java index ee9ea16cb34..648ddf5d379 100644 --- a/Mage.Sets/src/mage/cards/b/BelbesPortal.java +++ b/Mage.Sets/src/mage/cards/b/BelbesPortal.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +42,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ChosenSubtypePredicate; +import java.util.UUID; + /** * * @author andyfries diff --git a/Mage.Sets/src/mage/cards/b/BelfrySpirit.java b/Mage.Sets/src/mage/cards/b/BelfrySpirit.java index 6c8298ca67a..e19ca86b1e2 100644 --- a/Mage.Sets/src/mage/cards/b/BelfrySpirit.java +++ b/Mage.Sets/src/mage/cards/b/BelfrySpirit.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.CreateTokenEffect; @@ -36,8 +34,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.BatToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BelligerentHatchling.java b/Mage.Sets/src/mage/cards/b/BelligerentHatchling.java index df2f1deec40..194e13a09d5 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentHatchling.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentHatchling.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,8 @@ import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java index ce485225a8f..501b4695761 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BelligerentWhiptail.java b/Mage.Sets/src/mage/cards/b/BelligerentWhiptail.java index 5ad18df4c2e..c3d3614a34f 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentWhiptail.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentWhiptail.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BellowingFiend.java b/Mage.Sets/src/mage/cards/b/BellowingFiend.java index 2030cdb81ec..cd180da0eb6 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingFiend.java +++ b/Mage.Sets/src/mage/cards/b/BellowingFiend.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToACreatureTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BellowingSaddlebrute.java b/Mage.Sets/src/mage/cards/b/BellowingSaddlebrute.java index 1fdb503a408..d9413688b52 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingSaddlebrute.java +++ b/Mage.Sets/src/mage/cards/b/BellowingSaddlebrute.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.InvertCondition; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.watchers.common.PlayerAttackedWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java b/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java index 14eae938df1..e628a58d415 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java +++ b/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java @@ -28,10 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -39,10 +35,15 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BellowsLizard.java b/Mage.Sets/src/mage/cards/b/BellowsLizard.java index 4119ecb5cda..743ab0db6d6 100644 --- a/Mage.Sets/src/mage/cards/b/BellowsLizard.java +++ b/Mage.Sets/src/mage/cards/b/BellowsLizard.java @@ -28,18 +28,18 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BelltollDragon.java b/Mage.Sets/src/mage/cards/b/BelltollDragon.java index 9a64e3dd9b6..eaddc06ec8a 100644 --- a/Mage.Sets/src/mage/cards/b/BelltollDragon.java +++ b/Mage.Sets/src/mage/cards/b/BelltollDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -43,6 +42,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BelltowerSphinx.java b/Mage.Sets/src/mage/cards/b/BelltowerSphinx.java index 36732754dbf..df6d6f44fbb 100644 --- a/Mage.Sets/src/mage/cards/b/BelltowerSphinx.java +++ b/Mage.Sets/src/mage/cards/b/BelltowerSphinx.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/b/BelovedChaplain.java b/Mage.Sets/src/mage/cards/b/BelovedChaplain.java index 4a694e619ac..4c2d1a8edd7 100644 --- a/Mage.Sets/src/mage/cards/b/BelovedChaplain.java +++ b/Mage.Sets/src/mage/cards/b/BelovedChaplain.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author cbt33, BetaSteward (Black Knight) diff --git a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java index cfb33fcf7d8..58aefd6e530 100644 --- a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java +++ b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +36,8 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author Loki @@ -61,7 +62,7 @@ public class BenBenAkkiHermit extends CardImpl { public BenBenAkkiHermit (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/b/BenalishCavalry.java b/Mage.Sets/src/mage/cards/b/BenalishCavalry.java index 533188d2ca6..d684f31add4 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishCavalry.java +++ b/Mage.Sets/src/mage/cards/b/BenalishCavalry.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BenalishCommander.java b/Mage.Sets/src/mage/cards/b/BenalishCommander.java index ec1dedcfa84..a0688618863 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishCommander.java +++ b/Mage.Sets/src/mage/cards/b/BenalishCommander.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -49,6 +48,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.SoldierToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BenalishEmissary.java b/Mage.Sets/src/mage/cards/b/BenalishEmissary.java index b49a8650a92..178fa7378ff 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishEmissary.java +++ b/Mage.Sets/src/mage/cards/b/BenalishEmissary.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BenalishHeralds.java b/Mage.Sets/src/mage/cards/b/BenalishHeralds.java index 3e96dbe32e6..7000c42375d 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishHeralds.java +++ b/Mage.Sets/src/mage/cards/b/BenalishHeralds.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,8 +35,11 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BenalishKnight.java b/Mage.Sets/src/mage/cards/b/BenalishKnight.java index ddb74c0135f..f1f1a7d6fea 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishKnight.java +++ b/Mage.Sets/src/mage/cards/b/BenalishKnight.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BenalishLancer.java b/Mage.Sets/src/mage/cards/b/BenalishLancer.java index d8fd25dd1bf..4da9ae74fa9 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishLancer.java +++ b/Mage.Sets/src/mage/cards/b/BenalishLancer.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/b/BenalishMissionary.java b/Mage.Sets/src/mage/cards/b/BenalishMissionary.java index 8ff6c68b71c..477d66f57e7 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishMissionary.java +++ b/Mage.Sets/src/mage/cards/b/BenalishMissionary.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.BlockedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BenalishTrapper.java b/Mage.Sets/src/mage/cards/b/BenalishTrapper.java index 897bbb989ae..35635128401 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishTrapper.java +++ b/Mage.Sets/src/mage/cards/b/BenalishTrapper.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,13 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BenalishVeteran.java b/Mage.Sets/src/mage/cards/b/BenalishVeteran.java index 685da60deb6..51e73faa99a 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishVeteran.java +++ b/Mage.Sets/src/mage/cards/b/BenalishVeteran.java @@ -28,16 +28,16 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BenedictionOfMoons.java b/Mage.Sets/src/mage/cards/b/BenedictionOfMoons.java index edf9abb5f27..f0cb1fef530 100644 --- a/Mage.Sets/src/mage/cards/b/BenedictionOfMoons.java +++ b/Mage.Sets/src/mage/cards/b/BenedictionOfMoons.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.Game; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BenefactorsDraught.java b/Mage.Sets/src/mage/cards/b/BenefactorsDraught.java index 7abc822e65f..ec6f8975785 100644 --- a/Mage.Sets/src/mage/cards/b/BenefactorsDraught.java +++ b/Mage.Sets/src/mage/cards/b/BenefactorsDraught.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java b/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java index b9018726367..8beb77dde26 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java b/Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java index 34c93b8d412..a090e8c591b 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentBodyguard.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BenevolentOffering.java b/Mage.Sets/src/mage/cards/b/BenevolentOffering.java index 0e0c67a0862..91ff5f517c3 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentOffering.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentOffering.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -45,6 +44,8 @@ import mage.target.Target; import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BenthicBehemoth.java b/Mage.Sets/src/mage/cards/b/BenthicBehemoth.java index e2e16fff196..bed5cbf0c38 100644 --- a/Mage.Sets/src/mage/cards/b/BenthicBehemoth.java +++ b/Mage.Sets/src/mage/cards/b/BenthicBehemoth.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BenthicDjinn.java b/Mage.Sets/src/mage/cards/b/BenthicDjinn.java index ca25d0a7b9e..b1228ce67c8 100644 --- a/Mage.Sets/src/mage/cards/b/BenthicDjinn.java +++ b/Mage.Sets/src/mage/cards/b/BenthicDjinn.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BenthicGiant.java b/Mage.Sets/src/mage/cards/b/BenthicGiant.java index 3d64f29979f..8c98afe0d0c 100644 --- a/Mage.Sets/src/mage/cards/b/BenthicGiant.java +++ b/Mage.Sets/src/mage/cards/b/BenthicGiant.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BenthicInfiltrator.java b/Mage.Sets/src/mage/cards/b/BenthicInfiltrator.java index 6b126283a30..05760f44ceb 100644 --- a/Mage.Sets/src/mage/cards/b/BenthicInfiltrator.java +++ b/Mage.Sets/src/mage/cards/b/BenthicInfiltrator.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.CantBeBlockedSourceAbility; import mage.abilities.keyword.DevoidAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/Benthicore.java b/Mage.Sets/src/mage/cards/b/Benthicore.java index 87cab4b8c3c..e74017fe5f1 100644 --- a/Mage.Sets/src/mage/cards/b/Benthicore.java +++ b/Mage.Sets/src/mage/cards/b/Benthicore.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/b/Bequeathal.java b/Mage.Sets/src/mage/cards/b/Bequeathal.java index 6e5abfa4432..dbf35e2f16e 100644 --- a/Mage.Sets/src/mage/cards/b/Bequeathal.java +++ b/Mage.Sets/src/mage/cards/b/Bequeathal.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -40,6 +39,8 @@ import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Bereavement.java b/Mage.Sets/src/mage/cards/b/Bereavement.java index b1a25c167ea..485a4e0e896 100644 --- a/Mage.Sets/src/mage/cards/b/Bereavement.java +++ b/Mage.Sets/src/mage/cards/b/Bereavement.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/Berserk.java b/Mage.Sets/src/mage/cards/b/Berserk.java index ef1400a701a..3e9904b4b61 100644 --- a/Mage.Sets/src/mage/cards/b/Berserk.java +++ b/Mage.Sets/src/mage/cards/b/Berserk.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -41,11 +40,7 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -55,6 +50,8 @@ import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java b/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java index 4a95017f99f..5d7007ae5b0 100644 --- a/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java +++ b/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedAllTriggeredAbility; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Markedagain diff --git a/Mage.Sets/src/mage/cards/b/BerserkersOfBloodRidge.java b/Mage.Sets/src/mage/cards/b/BerserkersOfBloodRidge.java index aed713504b1..634d8626e4b 100644 --- a/Mage.Sets/src/mage/cards/b/BerserkersOfBloodRidge.java +++ b/Mage.Sets/src/mage/cards/b/BerserkersOfBloodRidge.java @@ -28,12 +28,13 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BerserkersOnslaught.java b/Mage.Sets/src/mage/cards/b/BerserkersOnslaught.java index 03d1faa1f3a..37838e5a411 100644 --- a/Mage.Sets/src/mage/cards/b/BerserkersOnslaught.java +++ b/Mage.Sets/src/mage/cards/b/BerserkersOnslaught.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.DoubleStrikeAbility; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java b/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java index ad25832c944..9100ad9fe49 100644 --- a/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java +++ b/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicate; import mage.game.Game; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BestialMenace.java b/Mage.Sets/src/mage/cards/b/BestialMenace.java index 0ec0d23c36b..71c682c2b72 100644 --- a/Mage.Sets/src/mage/cards/b/BestialMenace.java +++ b/Mage.Sets/src/mage/cards/b/BestialMenace.java @@ -28,15 +28,16 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.ElephantToken; import mage.game.permanent.token.SnakeToken; import mage.game.permanent.token.WolfToken; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/Betrayal.java b/Mage.Sets/src/mage/cards/b/Betrayal.java index 6a0525f9074..ee6dbfdfd8f 100644 --- a/Mage.Sets/src/mage/cards/b/Betrayal.java +++ b/Mage.Sets/src/mage/cards/b/Betrayal.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java b/Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java index 66f23cef42d..c71b467d9a7 100644 --- a/Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java +++ b/Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; @@ -42,6 +41,8 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/Bewilder.java b/Mage.Sets/src/mage/cards/b/Bewilder.java index c6bd93015fc..40237cf7a11 100644 --- a/Mage.Sets/src/mage/cards/b/Bewilder.java +++ b/Mage.Sets/src/mage/cards/b/Bewilder.java @@ -27,16 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BibFortuna.java b/Mage.Sets/src/mage/cards/b/BibFortuna.java index cd762667050..93c8e581e51 100644 --- a/Mage.Sets/src/mage/cards/b/BibFortuna.java +++ b/Mage.Sets/src/mage/cards/b/BibFortuna.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -38,8 +37,11 @@ import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Styxo @@ -48,7 +50,7 @@ public class BibFortuna extends CardImpl { public BibFortuna(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Twi'lek"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/BidentOfThassa.java b/Mage.Sets/src/mage/cards/b/BidentOfThassa.java index 58cf52ce561..44f3eb9d7d4 100644 --- a/Mage.Sets/src/mage/cards/b/BidentOfThassa.java +++ b/Mage.Sets/src/mage/cards/b/BidentOfThassa.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -46,6 +46,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class BidentOfThassa extends CardImpl { public BidentOfThassa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.ARTIFACT},"{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Whenever a creature you control deals combat damage to a player, you may draw a card. diff --git a/Mage.Sets/src/mage/cards/b/BigGameHunter.java b/Mage.Sets/src/mage/cards/b/BigGameHunter.java index c2eb5ed0081..0cdbece3c92 100644 --- a/Mage.Sets/src/mage/cards/b/BigGameHunter.java +++ b/Mage.Sets/src/mage/cards/b/BigGameHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BileBlight.java b/Mage.Sets/src/mage/cards/b/BileBlight.java index 62b65e92302..fd802a13612 100644 --- a/Mage.Sets/src/mage/cards/b/BileBlight.java +++ b/Mage.Sets/src/mage/cards/b/BileBlight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BileUrchin.java b/Mage.Sets/src/mage/cards/b/BileUrchin.java index 1e5d176eacc..80964d184cb 100644 --- a/Mage.Sets/src/mage/cards/b/BileUrchin.java +++ b/Mage.Sets/src/mage/cards/b/BileUrchin.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +34,12 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Bind.java b/Mage.Sets/src/mage/cards/b/Bind.java index 8d1b8c51be1..8c5b5f15fd0 100644 --- a/Mage.Sets/src/mage/cards/b/Bind.java +++ b/Mage.Sets/src/mage/cards/b/Bind.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetActivatedAbility; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BindingAgony.java b/Mage.Sets/src/mage/cards/b/BindingAgony.java index 5b8ea3ca688..5cb0c87ab02 100644 --- a/Mage.Sets/src/mage/cards/b/BindingAgony.java +++ b/Mage.Sets/src/mage/cards/b/BindingAgony.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DealtDamageAttachedTriggeredAbility; import mage.abilities.dynamicvalue.common.NumericSetToEffectValues; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BindingGrasp.java b/Mage.Sets/src/mage/cards/b/BindingGrasp.java index 68b0089cd6b..9c468bd6f17 100644 --- a/Mage.Sets/src/mage/cards/b/BindingGrasp.java +++ b/Mage.Sets/src/mage/cards/b/BindingGrasp.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,14 +38,12 @@ import mage.abilities.effects.common.continuous.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BiomanticMastery.java b/Mage.Sets/src/mage/cards/b/BiomanticMastery.java index 322e667f6b8..b5c2d1c29e1 100644 --- a/Mage.Sets/src/mage/cards/b/BiomanticMastery.java +++ b/Mage.Sets/src/mage/cards/b/BiomanticMastery.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BiomassMutation.java b/Mage.Sets/src/mage/cards/b/BiomassMutation.java index 259226b738e..6d379e84ff4 100644 --- a/Mage.Sets/src/mage/cards/b/BiomassMutation.java +++ b/Mage.Sets/src/mage/cards/b/BiomassMutation.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.continuous.SetPowerToughnessAllEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Biorhythm.java b/Mage.Sets/src/mage/cards/b/Biorhythm.java index e7dae760730..05601bfade4 100644 --- a/Mage.Sets/src/mage/cards/b/Biorhythm.java +++ b/Mage.Sets/src/mage/cards/b/Biorhythm.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/Bioshift.java b/Mage.Sets/src/mage/cards/b/Bioshift.java index 70ef879b1ff..28d0ffba0a7 100644 --- a/Mage.Sets/src/mage/cards/b/Bioshift.java +++ b/Mage.Sets/src/mage/cards/b/Bioshift.java @@ -27,14 +27,12 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageItem; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -47,6 +45,8 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Biovisionary.java b/Mage.Sets/src/mage/cards/b/Biovisionary.java index fa15ca9084f..85fb04f0d3a 100644 --- a/Mage.Sets/src/mage/cards/b/Biovisionary.java +++ b/Mage.Sets/src/mage/cards/b/Biovisionary.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java index c3313b84b69..c84cc40f358 100644 --- a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java +++ b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BirdMaiden.java b/Mage.Sets/src/mage/cards/b/BirdMaiden.java index 304e9f37a5a..d3d9d38b957 100644 --- a/Mage.Sets/src/mage/cards/b/BirdMaiden.java +++ b/Mage.Sets/src/mage/cards/b/BirdMaiden.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BirdsOfParadise.java b/Mage.Sets/src/mage/cards/b/BirdsOfParadise.java index 01880bcdd12..96f1cef118c 100644 --- a/Mage.Sets/src/mage/cards/b/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/cards/b/BirdsOfParadise.java @@ -28,13 +28,14 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BirthingHulk.java b/Mage.Sets/src/mage/cards/b/BirthingHulk.java index 8de09ea216e..868566fc1f5 100644 --- a/Mage.Sets/src/mage/cards/b/BirthingHulk.java +++ b/Mage.Sets/src/mage/cards/b/BirthingHulk.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.EldraziScionToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BirthingPod.java b/Mage.Sets/src/mage/cards/b/BirthingPod.java index 79db6507537..40cfc3b1d3e 100644 --- a/Mage.Sets/src/mage/cards/b/BirthingPod.java +++ b/Mage.Sets/src/mage/cards/b/BirthingPod.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.Cost; @@ -51,6 +50,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BiteOfTheBlackRose.java b/Mage.Sets/src/mage/cards/b/BiteOfTheBlackRose.java index e66bf7968cf..3493596253d 100644 --- a/Mage.Sets/src/mage/cards/b/BiteOfTheBlackRose.java +++ b/Mage.Sets/src/mage/cards/b/BiteOfTheBlackRose.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.ContinuousEffect; @@ -43,6 +42,8 @@ import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BitingRain.java b/Mage.Sets/src/mage/cards/b/BitingRain.java index cc8a0cc7012..82a15428224 100644 --- a/Mage.Sets/src/mage/cards/b/BitingRain.java +++ b/Mage.Sets/src/mage/cards/b/BitingRain.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.MadnessAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BitingTether.java b/Mage.Sets/src/mage/cards/b/BitingTether.java index e3a2d38975f..1a0dd0a1ace 100644 --- a/Mage.Sets/src/mage/cards/b/BitingTether.java +++ b/Mage.Sets/src/mage/cards/b/BitingTether.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.counters.CounterType; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BitterFeud.java b/Mage.Sets/src/mage/cards/b/BitterFeud.java index 5297a739da0..59b439a698b 100644 --- a/Mage.Sets/src/mage/cards/b/BitterFeud.java +++ b/Mage.Sets/src/mage/cards/b/BitterFeud.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -48,6 +47,8 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BitterOrdeal.java b/Mage.Sets/src/mage/cards/b/BitterOrdeal.java index 4ec58216d76..2500e28707f 100644 --- a/Mage.Sets/src/mage/cards/b/BitterOrdeal.java +++ b/Mage.Sets/src/mage/cards/b/BitterOrdeal.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.GravestormAbility; @@ -43,6 +42,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; import mage.watchers.common.GravestormWatcher; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BitterRevelation.java b/Mage.Sets/src/mage/cards/b/BitterRevelation.java index d5f7c2ca83c..e807eca7116 100644 --- a/Mage.Sets/src/mage/cards/b/BitterRevelation.java +++ b/Mage.Sets/src/mage/cards/b/BitterRevelation.java @@ -27,15 +27,10 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -44,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/Bitterblossom.java b/Mage.Sets/src/mage/cards/b/Bitterblossom.java index 791b24ceda6..3dab91f66da 100644 --- a/Mage.Sets/src/mage/cards/b/Bitterblossom.java +++ b/Mage.Sets/src/mage/cards/b/Bitterblossom.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.game.permanent.token.FaerieRogueToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BitterheartWitch.java b/Mage.Sets/src/mage/cards/b/BitterheartWitch.java index 43637aa013e..1927e3db142 100644 --- a/Mage.Sets/src/mage/cards/b/BitterheartWitch.java +++ b/Mage.Sets/src/mage/cards/b/BitterheartWitch.java @@ -27,11 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -40,6 +35,9 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -47,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/b/BituminousBlast.java b/Mage.Sets/src/mage/cards/b/BituminousBlast.java index b45be46c63b..0ddc277c771 100644 --- a/Mage.Sets/src/mage/cards/b/BituminousBlast.java +++ b/Mage.Sets/src/mage/cards/b/BituminousBlast.java @@ -28,14 +28,15 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BlackCarriage.java b/Mage.Sets/src/mage/cards/b/BlackCarriage.java index b9da94fc162..70993753282 100644 --- a/Mage.Sets/src/mage/cards/b/BlackCarriage.java +++ b/Mage.Sets/src/mage/cards/b/BlackCarriage.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.IsStepCondition; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlackCat.java b/Mage.Sets/src/mage/cards/b/BlackCat.java index 7a3e889ff9b..089e673f5fe 100644 --- a/Mage.Sets/src/mage/cards/b/BlackCat.java +++ b/Mage.Sets/src/mage/cards/b/BlackCat.java @@ -29,13 +29,13 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetOpponent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BlackKnight.java b/Mage.Sets/src/mage/cards/b/BlackKnight.java index b298458de49..d25932c2a45 100644 --- a/Mage.Sets/src/mage/cards/b/BlackKnight.java +++ b/Mage.Sets/src/mage/cards/b/BlackKnight.java @@ -28,14 +28,15 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlackLotus.java b/Mage.Sets/src/mage/cards/b/BlackLotus.java index 2d8d4e2ecec..359b66ac09e 100644 --- a/Mage.Sets/src/mage/cards/b/BlackLotus.java +++ b/Mage.Sets/src/mage/cards/b/BlackLotus.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlackMarket.java b/Mage.Sets/src/mage/cards/b/BlackMarket.java index 13045c2e492..507e8008fa3 100644 --- a/Mage.Sets/src/mage/cards/b/BlackMarket.java +++ b/Mage.Sets/src/mage/cards/b/BlackMarket.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.BeginningOfPreCombatMainTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author markedagain diff --git a/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java b/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java index fb5e651977e..0a17c645daa 100644 --- a/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java +++ b/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetOpponentsCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java index 02f64022675..8aa0c99c484 100644 --- a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java +++ b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java b/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java index a2b18e85d6e..06335ea3b73 100644 --- a/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java +++ b/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -35,6 +34,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/cards/b/BlackScarab.java b/Mage.Sets/src/mage/cards/b/BlackScarab.java index df2b59028ae..6ad280553ee 100644 --- a/Mage.Sets/src/mage/cards/b/BlackScarab.java +++ b/Mage.Sets/src/mage/cards/b/BlackScarab.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,17 +39,15 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Zeplar1_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BlackSunsZenith.java b/Mage.Sets/src/mage/cards/b/BlackSunsZenith.java index 1e41703544b..ebb5643ef89 100644 --- a/Mage.Sets/src/mage/cards/b/BlackSunsZenith.java +++ b/Mage.Sets/src/mage/cards/b/BlackSunsZenith.java @@ -28,19 +28,19 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BlackVise.java b/Mage.Sets/src/mage/cards/b/BlackVise.java index b7610204d97..7d6eb5329e4 100644 --- a/Mage.Sets/src/mage/cards/b/BlackVise.java +++ b/Mage.Sets/src/mage/cards/b/BlackVise.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/b/BlackWard.java b/Mage.Sets/src/mage/cards/b/BlackWard.java index 4dd1c5d6827..8989ac3ef24 100644 --- a/Mage.Sets/src/mage/cards/b/BlackWard.java +++ b/Mage.Sets/src/mage/cards/b/BlackWard.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BlackcleaveCliffs.java b/Mage.Sets/src/mage/cards/b/BlackcleaveCliffs.java index 33f9f244505..589d743d159 100644 --- a/Mage.Sets/src/mage/cards/b/BlackcleaveCliffs.java +++ b/Mage.Sets/src/mage/cards/b/BlackcleaveCliffs.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -43,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/b/BlackcleaveGoblin.java b/Mage.Sets/src/mage/cards/b/BlackcleaveGoblin.java index e4f04513692..cc6bd038514 100644 --- a/Mage.Sets/src/mage/cards/b/BlackcleaveGoblin.java +++ b/Mage.Sets/src/mage/cards/b/BlackcleaveGoblin.java @@ -28,13 +28,14 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Blackmail.java b/Mage.Sets/src/mage/cards/b/Blackmail.java index ffe9f9b4573..b23f6a3f14d 100644 --- a/Mage.Sets/src/mage/cards/b/Blackmail.java +++ b/Mage.Sets/src/mage/cards/b/Blackmail.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BladeOfSelves.java b/Mage.Sets/src/mage/cards/b/BladeOfSelves.java index 2a21c767389..2963381bdee 100644 --- a/Mage.Sets/src/mage/cards/b/BladeOfSelves.java +++ b/Mage.Sets/src/mage/cards/b/BladeOfSelves.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BladeOfTheBloodchief.java b/Mage.Sets/src/mage/cards/b/BladeOfTheBloodchief.java index 1773c640858..2d7f0fd9110 100644 --- a/Mage.Sets/src/mage/cards/b/BladeOfTheBloodchief.java +++ b/Mage.Sets/src/mage/cards/b/BladeOfTheBloodchief.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author mamaurer, nantuko diff --git a/Mage.Sets/src/mage/cards/b/BladeOfTheSixthPride.java b/Mage.Sets/src/mage/cards/b/BladeOfTheSixthPride.java index 0f0d7c146f5..e9f7ed761e3 100644 --- a/Mage.Sets/src/mage/cards/b/BladeOfTheSixthPride.java +++ b/Mage.Sets/src/mage/cards/b/BladeOfTheSixthPride.java @@ -27,11 +27,12 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BladeSliver.java b/Mage.Sets/src/mage/cards/b/BladeSliver.java index f9d682b0c2b..cf078e94224 100644 --- a/Mage.Sets/src/mage/cards/b/BladeSliver.java +++ b/Mage.Sets/src/mage/cards/b/BladeSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/b/BladeSplicer.java b/Mage.Sets/src/mage/cards/b/BladeSplicer.java index c4ab6162667..2a51a479724 100644 --- a/Mage.Sets/src/mage/cards/b/BladeSplicer.java +++ b/Mage.Sets/src/mage/cards/b/BladeSplicer.java @@ -28,11 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,11 +36,16 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GolemToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java b/Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java index ae34244fdc2..49aaaac3057 100644 --- a/Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java +++ b/Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +37,10 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BladedBracers.java b/Mage.Sets/src/mage/cards/b/BladedBracers.java index f0b18a301c3..71956a0f4eb 100644 --- a/Mage.Sets/src/mage/cards/b/BladedBracers.java +++ b/Mage.Sets/src/mage/cards/b/BladedBracers.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -38,6 +37,10 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BladedPinions.java b/Mage.Sets/src/mage/cards/b/BladedPinions.java index 541d830505f..c4b2b955a9b 100644 --- a/Mage.Sets/src/mage/cards/b/BladedPinions.java +++ b/Mage.Sets/src/mage/cards/b/BladedPinions.java @@ -28,11 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -41,7 +36,12 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BladedSentinel.java b/Mage.Sets/src/mage/cards/b/BladedSentinel.java index 56aae0c5b8e..803e4b3e01f 100644 --- a/Mage.Sets/src/mage/cards/b/BladedSentinel.java +++ b/Mage.Sets/src/mage/cards/b/BladedSentinel.java @@ -28,10 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +35,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java b/Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java index 712629f0f5e..dd9e92c4409 100644 --- a/Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java +++ b/Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BladetuskBoar.java b/Mage.Sets/src/mage/cards/b/BladetuskBoar.java index e8683dc245c..a7ee32bef5a 100644 --- a/Mage.Sets/src/mage/cards/b/BladetuskBoar.java +++ b/Mage.Sets/src/mage/cards/b/BladetuskBoar.java @@ -28,12 +28,13 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java b/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java index adef596d147..31692c33147 100644 --- a/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java +++ b/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterPermanentCard; @@ -47,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +64,7 @@ public class BladewingTheRisen extends CardImpl { public BladewingTheRisen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Dragon"); diff --git a/Mage.Sets/src/mage/cards/b/BladewingsThrall.java b/Mage.Sets/src/mage/cards/b/BladewingsThrall.java index 730ab58920d..18649626f39 100644 --- a/Mage.Sets/src/mage/cards/b/BladewingsThrall.java +++ b/Mage.Sets/src/mage/cards/b/BladewingsThrall.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author nomage diff --git a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java index f513e4969c2..4feed5616c5 100644 --- a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -38,11 +35,17 @@ 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BlanchwoodTreefolk.java b/Mage.Sets/src/mage/cards/b/BlanchwoodTreefolk.java index 94fdc31832b..cd905413c8a 100644 --- a/Mage.Sets/src/mage/cards/b/BlanchwoodTreefolk.java +++ b/Mage.Sets/src/mage/cards/b/BlanchwoodTreefolk.java @@ -28,11 +28,12 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlanketOfNight.java b/Mage.Sets/src/mage/cards/b/BlanketOfNight.java index 5807f7a5a6d..3daf758aab0 100644 --- a/Mage.Sets/src/mage/cards/b/BlanketOfNight.java +++ b/Mage.Sets/src/mage/cards/b/BlanketOfNight.java @@ -27,21 +27,21 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.continuous.AddCardSubtypeAllEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.abilities.effects.common.continuous.AddCardSubtypeAllEffect; import mage.constants.CardType; import mage.constants.DependencyType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/b/BlasphemousAct.java b/Mage.Sets/src/mage/cards/b/BlasphemousAct.java index 89ebe4f7754..60fa924a641 100644 --- a/Mage.Sets/src/mage/cards/b/BlasphemousAct.java +++ b/Mage.Sets/src/mage/cards/b/BlasphemousAct.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; @@ -37,15 +34,14 @@ import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * @author nantuko diff --git a/Mage.Sets/src/mage/cards/b/BlastOfGenius.java b/Mage.Sets/src/mage/cards/b/BlastOfGenius.java index 5c815b321ea..7eaf0234bf1 100644 --- a/Mage.Sets/src/mage/cards/b/BlastOfGenius.java +++ b/Mage.Sets/src/mage/cards/b/BlastOfGenius.java @@ -28,20 +28,21 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetDiscard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlastedLandscape.java b/Mage.Sets/src/mage/cards/b/BlastedLandscape.java index c9d7ff86439..061399ce8a1 100644 --- a/Mage.Sets/src/mage/cards/b/BlastedLandscape.java +++ b/Mage.Sets/src/mage/cards/b/BlastedLandscape.java @@ -28,13 +28,14 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlasterMage.java b/Mage.Sets/src/mage/cards/b/BlasterMage.java index 0fca26691e5..0022e28fa22 100644 --- a/Mage.Sets/src/mage/cards/b/BlasterMage.java +++ b/Mage.Sets/src/mage/cards/b/BlasterMage.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BlastfireBolt.java b/Mage.Sets/src/mage/cards/b/BlastfireBolt.java index ea0ce6df855..b49ac26a0e9 100644 --- a/Mage.Sets/src/mage/cards/b/BlastfireBolt.java +++ b/Mage.Sets/src/mage/cards/b/BlastfireBolt.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.ArrayList; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -41,6 +39,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BlastingStation.java b/Mage.Sets/src/mage/cards/b/BlastingStation.java index 75957e0f8fe..ff3094a5c7e 100644 --- a/Mage.Sets/src/mage/cards/b/BlastingStation.java +++ b/Mage.Sets/src/mage/cards/b/BlastingStation.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Blastoderm.java b/Mage.Sets/src/mage/cards/b/Blastoderm.java index d1939746bd7..d81824ea9a3 100644 --- a/Mage.Sets/src/mage/cards/b/Blastoderm.java +++ b/Mage.Sets/src/mage/cards/b/Blastoderm.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FadingAbility; import mage.abilities.keyword.ShroudAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlatantThievery.java b/Mage.Sets/src/mage/cards/b/BlatantThievery.java index f802b0e0fd1..091e1d1a1fd 100644 --- a/Mage.Sets/src/mage/cards/b/BlatantThievery.java +++ b/Mage.Sets/src/mage/cards/b/BlatantThievery.java @@ -27,11 +27,6 @@ */ package mage.cards.b; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -49,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.*; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/Blaze.java b/Mage.Sets/src/mage/cards/b/Blaze.java index 23205b53b39..91a5de51e91 100644 --- a/Mage.Sets/src/mage/cards/b/Blaze.java +++ b/Mage.Sets/src/mage/cards/b/Blaze.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BlazeCommando.java b/Mage.Sets/src/mage/cards/b/BlazeCommando.java index 2fb26e9b1d6..8d1d2fa618d 100644 --- a/Mage.Sets/src/mage/cards/b/BlazeCommando.java +++ b/Mage.Sets/src/mage/cards/b/BlazeCommando.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; @@ -40,10 +37,14 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.game.Game; -import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.SoldierTokenWithHaste; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java b/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java index 2d8c728961b..e40c71c5085 100644 --- a/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java +++ b/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BlazingArchon.java b/Mage.Sets/src/mage/cards/b/BlazingArchon.java index 0345be22bae..ee637326381 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingArchon.java +++ b/Mage.Sets/src/mage/cards/b/BlazingArchon.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantAttackYouAllEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java b/Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java index f5fbca171a8..bcda1dab5b6 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java +++ b/Mage.Sets/src/mage/cards/b/BlazingBladeAskari.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java index feabcbb52ad..d1bb7f99b08 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java +++ b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlazingSalvo.java b/Mage.Sets/src/mage/cards/b/BlazingSalvo.java index ce5b8a90087..23ed1d511cb 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingSalvo.java +++ b/Mage.Sets/src/mage/cards/b/BlazingSalvo.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/b/BlazingShoal.java b/Mage.Sets/src/mage/cards/b/BlazingShoal.java index 94770b9d9c3..bbca7c6081e 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingShoal.java +++ b/Mage.Sets/src/mage/cards/b/BlazingShoal.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlazingSpecter.java b/Mage.Sets/src/mage/cards/b/BlazingSpecter.java index 2e2db758bf8..ef6a09402a6 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingSpecter.java +++ b/Mage.Sets/src/mage/cards/b/BlazingSpecter.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BlazingTorch.java b/Mage.Sets/src/mage/cards/b/BlazingTorch.java index 089eea6380a..eab39fc829c 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingTorch.java +++ b/Mage.Sets/src/mage/cards/b/BlazingTorch.java @@ -27,13 +27,6 @@ */ package mage.cards.b; -import java.util.List; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -47,11 +40,15 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.List; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BleakCovenVampires.java b/Mage.Sets/src/mage/cards/b/BleakCovenVampires.java index 416c2895888..dc19ec80b94 100644 --- a/Mage.Sets/src/mage/cards/b/BleakCovenVampires.java +++ b/Mage.Sets/src/mage/cards/b/BleakCovenVampires.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,9 +36,12 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.Target; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BlessedAlliance.java b/Mage.Sets/src/mage/cards/b/BlessedAlliance.java index bda99e75e57..51d9a6ff332 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedAlliance.java +++ b/Mage.Sets/src/mage/cards/b/BlessedAlliance.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.filter.predicate.other.PlayerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BlessedBreath.java b/Mage.Sets/src/mage/cards/b/BlessedBreath.java index 8f5c8904ac4..0c77595a449 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedBreath.java +++ b/Mage.Sets/src/mage/cards/b/BlessedBreath.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.continuous.GainProtectionFromColorTargetEffect; import mage.abilities.keyword.SpliceOntoArcaneAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlessedOrator.java b/Mage.Sets/src/mage/cards/b/BlessedOrator.java index e2117ebf92b..208b184accd 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedOrator.java +++ b/Mage.Sets/src/mage/cards/b/BlessedOrator.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author noxx (Angel of Jubilation), cbt33 diff --git a/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java b/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java index b4f3f4b2c7c..cb45a8cb370 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java +++ b/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java @@ -27,17 +27,11 @@ */ package mage.cards.b; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.ReboundAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -50,6 +44,9 @@ import mage.players.Library; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.Set; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlessedSpirits.java b/Mage.Sets/src/mage/cards/b/BlessedSpirits.java index 45bd825eb81..349065cdb27 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedSpirits.java +++ b/Mage.Sets/src/mage/cards/b/BlessedSpirits.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -39,6 +38,8 @@ import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlessedWind.java b/Mage.Sets/src/mage/cards/b/BlessedWind.java index db252890d15..816dcae5299 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedWind.java +++ b/Mage.Sets/src/mage/cards/b/BlessedWind.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.SetPlayerLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BlessedWine.java b/Mage.Sets/src/mage/cards/b/BlessedWine.java index d7eb38727f2..ff38fd414a4 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedWine.java +++ b/Mage.Sets/src/mage/cards/b/BlessedWine.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/Blessing.java b/Mage.Sets/src/mage/cards/b/Blessing.java index eaf36613bce..2beb2af7b01 100644 --- a/Mage.Sets/src/mage/cards/b/Blessing.java +++ b/Mage.Sets/src/mage/cards/b/Blessing.java @@ -27,12 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -41,9 +35,12 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java b/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java index 95003e3c179..57f266c709b 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java +++ b/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,9 +39,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java b/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java index f51cfedf418..4476690d685 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java +++ b/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -38,12 +36,17 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BlessingsOfNature.java b/Mage.Sets/src/mage/cards/b/BlessingsOfNature.java index 1ead36fabba..cbe93b7c878 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingsOfNature.java +++ b/Mage.Sets/src/mage/cards/b/BlessingsOfNature.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.DistributeCountersEffect; import mage.abilities.keyword.MiracleAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/Blight.java b/Mage.Sets/src/mage/cards/b/Blight.java index 02539205c52..fa515041b7f 100644 --- a/Mage.Sets/src/mage/cards/b/Blight.java +++ b/Mage.Sets/src/mage/cards/b/Blight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -40,6 +39,8 @@ import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BlightHerder.java b/Mage.Sets/src/mage/cards/b/BlightHerder.java index 7d727400bb7..56b797e4b4d 100644 --- a/Mage.Sets/src/mage/cards/b/BlightHerder.java +++ b/Mage.Sets/src/mage/cards/b/BlightHerder.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -49,6 +48,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInExile; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlightMamba.java b/Mage.Sets/src/mage/cards/b/BlightMamba.java index 4132fff113a..e0b28ab7d45 100644 --- a/Mage.Sets/src/mage/cards/b/BlightMamba.java +++ b/Mage.Sets/src/mage/cards/b/BlightMamba.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +35,10 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlightSickle.java b/Mage.Sets/src/mage/cards/b/BlightSickle.java index ef93a18eb4e..67a42d25219 100644 --- a/Mage.Sets/src/mage/cards/b/BlightSickle.java +++ b/Mage.Sets/src/mage/cards/b/BlightSickle.java @@ -27,11 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -40,6 +35,12 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Blightcaster.java b/Mage.Sets/src/mage/cards/b/Blightcaster.java index bcea513aeb3..6cb6bab4141 100644 --- a/Mage.Sets/src/mage/cards/b/Blightcaster.java +++ b/Mage.Sets/src/mage/cards/b/Blightcaster.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlightedAgent.java b/Mage.Sets/src/mage/cards/b/BlightedAgent.java index f7b6e4bfb6e..cd2a1f46b2d 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedAgent.java +++ b/Mage.Sets/src/mage/cards/b/BlightedAgent.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.CantBeBlockedSourceAbility; +import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlightedCataract.java b/Mage.Sets/src/mage/cards/b/BlightedCataract.java index a74b147b86a..2f6e52f994e 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedCataract.java +++ b/Mage.Sets/src/mage/cards/b/BlightedCataract.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlightedFen.java b/Mage.Sets/src/mage/cards/b/BlightedFen.java index 4e7d4625eee..586f3ddc924 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedFen.java +++ b/Mage.Sets/src/mage/cards/b/BlightedFen.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlightedGorge.java b/Mage.Sets/src/mage/cards/b/BlightedGorge.java index dc371a11046..c20cc6ba063 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedGorge.java +++ b/Mage.Sets/src/mage/cards/b/BlightedGorge.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlightedShaman.java b/Mage.Sets/src/mage/cards/b/BlightedShaman.java index 7c2cef93d53..903d30ec102 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedShaman.java +++ b/Mage.Sets/src/mage/cards/b/BlightedShaman.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BlightedSteppe.java b/Mage.Sets/src/mage/cards/b/BlightedSteppe.java index 0e4f986474d..ad6d1714485 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedSteppe.java +++ b/Mage.Sets/src/mage/cards/b/BlightedSteppe.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlightedWoodland.java b/Mage.Sets/src/mage/cards/b/BlightedWoodland.java index 3579049c405..d32db14d33e 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedWoodland.java +++ b/Mage.Sets/src/mage/cards/b/BlightedWoodland.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Blightning.java b/Mage.Sets/src/mage/cards/b/Blightning.java index 70946304124..a5e5878d9f8 100644 --- a/Mage.Sets/src/mage/cards/b/Blightning.java +++ b/Mage.Sets/src/mage/cards/b/Blightning.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BlightsoilDruid.java b/Mage.Sets/src/mage/cards/b/BlightsoilDruid.java index b84a7278fd8..df59065ab10 100644 --- a/Mage.Sets/src/mage/cards/b/BlightsoilDruid.java +++ b/Mage.Sets/src/mage/cards/b/BlightsoilDruid.java @@ -27,15 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Blightspeaker.java b/Mage.Sets/src/mage/cards/b/Blightspeaker.java index f9f2f35e668..125d5934370 100644 --- a/Mage.Sets/src/mage/cards/b/Blightspeaker.java +++ b/Mage.Sets/src/mage/cards/b/Blightspeaker.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlightsteelColossus.java b/Mage.Sets/src/mage/cards/b/BlightsteelColossus.java index e1594a8f89e..11c5338d5ec 100644 --- a/Mage.Sets/src/mage/cards/b/BlightsteelColossus.java +++ b/Mage.Sets/src/mage/cards/b/BlightsteelColossus.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.PutIntoGraveFromAnywhereSourceAbility; import mage.abilities.effects.common.RevealAndShuffleIntoLibrarySourceEffect; @@ -39,6 +36,9 @@ import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Blightwidow.java b/Mage.Sets/src/mage/cards/b/Blightwidow.java index 94d9cec9eb0..0b7466f6625 100644 --- a/Mage.Sets/src/mage/cards/b/Blightwidow.java +++ b/Mage.Sets/src/mage/cards/b/Blightwidow.java @@ -28,13 +28,14 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlindCreeper.java b/Mage.Sets/src/mage/cards/b/BlindCreeper.java index cf8d9579cae..9103ab3922d 100644 --- a/Mage.Sets/src/mage/cards/b/BlindCreeper.java +++ b/Mage.Sets/src/mage/cards/b/BlindCreeper.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BlindHunter.java b/Mage.Sets/src/mage/cards/b/BlindHunter.java index 91c739a4ed4..6d379f57ca3 100644 --- a/Mage.Sets/src/mage/cards/b/BlindHunter.java +++ b/Mage.Sets/src/mage/cards/b/BlindHunter.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.GainLifeEffect; @@ -37,8 +35,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlindObedience.java b/Mage.Sets/src/mage/cards/b/BlindObedience.java index ee2b8547c3f..19936856954 100644 --- a/Mage.Sets/src/mage/cards/b/BlindObedience.java +++ b/Mage.Sets/src/mage/cards/b/BlindObedience.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -43,6 +42,8 @@ import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlindPhantasm.java b/Mage.Sets/src/mage/cards/b/BlindPhantasm.java index 19f7bef014f..96aca01c7e8 100644 --- a/Mage.Sets/src/mage/cards/b/BlindPhantasm.java +++ b/Mage.Sets/src/mage/cards/b/BlindPhantasm.java @@ -27,11 +27,12 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlindSeer.java b/Mage.Sets/src/mage/cards/b/BlindSeer.java index 30762c3f2d3..35977c3a4fd 100644 --- a/Mage.Sets/src/mage/cards/b/BlindSeer.java +++ b/Mage.Sets/src/mage/cards/b/BlindSeer.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +36,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetSpellOrPermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -49,7 +51,7 @@ public class BlindSeer extends CardImpl { public BlindSeer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java index 34c8aabe45a..63f9bf99091 100644 --- a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java +++ b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlindWithAnger.java b/Mage.Sets/src/mage/cards/b/BlindWithAnger.java index 782a032e225..4c1134ea122 100644 --- a/Mage.Sets/src/mage/cards/b/BlindWithAnger.java +++ b/Mage.Sets/src/mage/cards/b/BlindWithAnger.java @@ -28,22 +28,23 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ @@ -52,7 +53,7 @@ public class BlindWithAnger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature"); static { - filter.add(Predicates.not(new SupertypePredicate("Legendary"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); } public BlindWithAnger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlindWorship.java b/Mage.Sets/src/mage/cards/b/BlindWorship.java index 567e38f8e53..a9c2d49997f 100644 --- a/Mage.Sets/src/mage/cards/b/BlindWorship.java +++ b/Mage.Sets/src/mage/cards/b/BlindWorship.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,15 +39,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BlindZealot.java b/Mage.Sets/src/mage/cards/b/BlindZealot.java index 74d7892455c..f839c176c02 100644 --- a/Mage.Sets/src/mage/cards/b/BlindZealot.java +++ b/Mage.Sets/src/mage/cards/b/BlindZealot.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BlindingAngel.java b/Mage.Sets/src/mage/cards/b/BlindingAngel.java index c11b7d9193f..957d371754b 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingAngel.java +++ b/Mage.Sets/src/mage/cards/b/BlindingAngel.java @@ -27,15 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; +import mage.abilities.effects.common.SkipNextCombatEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.abilities.effects.common.SkipNextCombatEffect; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlindingBeam.java b/Mage.Sets/src/mage/cards/b/BlindingBeam.java index 549a575b482..a6024c756c6 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingBeam.java +++ b/Mage.Sets/src/mage/cards/b/BlindingBeam.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -50,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlindingDrone.java b/Mage.Sets/src/mage/cards/b/BlindingDrone.java index 675dabc7cd4..c3a59831f3b 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingDrone.java +++ b/Mage.Sets/src/mage/cards/b/BlindingDrone.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlindingFlare.java b/Mage.Sets/src/mage/cards/b/BlindingFlare.java index 22f4db052eb..e40a88a9a23 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingFlare.java +++ b/Mage.Sets/src/mage/cards/b/BlindingFlare.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.abilityword.StriveAbility; import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlindingLight.java b/Mage.Sets/src/mage/cards/b/BlindingLight.java index 9c128d2f4a4..886098c501a 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingLight.java +++ b/Mage.Sets/src/mage/cards/b/BlindingLight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.TapAllEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BlindingMage.java b/Mage.Sets/src/mage/cards/b/BlindingMage.java index c82f21cfb87..016b1138eb5 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingMage.java +++ b/Mage.Sets/src/mage/cards/b/BlindingMage.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BlindingPowder.java b/Mage.Sets/src/mage/cards/b/BlindingPowder.java index 67155c4a7e9..f631066d9d8 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingPowder.java +++ b/Mage.Sets/src/mage/cards/b/BlindingPowder.java @@ -27,10 +27,10 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.common.UnattachCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.PreventCombatDamageToSourceEffect; @@ -38,12 +38,9 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; -import mage.abilities.costs.common.UnattachCost; +import mage.constants.*; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlindingSouleater.java b/Mage.Sets/src/mage/cards/b/BlindingSouleater.java index 5cd65289f26..43ddacdc4cf 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingSouleater.java +++ b/Mage.Sets/src/mage/cards/b/BlindingSouleater.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BlindingSpray.java b/Mage.Sets/src/mage/cards/b/BlindingSpray.java index e3b2800025f..7b4c73a9870 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingSpray.java +++ b/Mage.Sets/src/mage/cards/b/BlindingSpray.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlinkingSpirit.java b/Mage.Sets/src/mage/cards/b/BlinkingSpirit.java index f1540b7bfb9..f580a2378c8 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkingSpirit.java +++ b/Mage.Sets/src/mage/cards/b/BlinkingSpirit.java @@ -27,17 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothInfusion.java b/Mage.Sets/src/mage/cards/b/BlinkmothInfusion.java index 705254a6698..dcd2421c1cb 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothInfusion.java +++ b/Mage.Sets/src/mage/cards/b/BlinkmothInfusion.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.AffinityForArtifactsAbility; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java b/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java index 6f40bd5b166..3a386d36f22 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java +++ b/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java @@ -28,10 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,12 +39,16 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java b/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java index 8113d514b21..c81b11b1c19 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java +++ b/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java @@ -5,7 +5,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.BeginningOfPreCombatMainTriggeredAbility; @@ -21,6 +20,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author nickmyers diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothWell.java b/Mage.Sets/src/mage/cards/b/BlinkmothWell.java index 15403306e87..cfe01f43cb3 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothWell.java +++ b/Mage.Sets/src/mage/cards/b/BlinkmothWell.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlisterBeetle.java b/Mage.Sets/src/mage/cards/b/BlisterBeetle.java index b864ef5f800..a2e44249473 100644 --- a/Mage.Sets/src/mage/cards/b/BlisterBeetle.java +++ b/Mage.Sets/src/mage/cards/b/BlisterBeetle.java @@ -27,17 +27,18 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BlistercoilWeird.java b/Mage.Sets/src/mage/cards/b/BlistercoilWeird.java index ffdf2220ef3..93ec6c1ad16 100644 --- a/Mage.Sets/src/mage/cards/b/BlistercoilWeird.java +++ b/Mage.Sets/src/mage/cards/b/BlistercoilWeird.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -37,11 +34,14 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * @author LevelX2 */ diff --git a/Mage.Sets/src/mage/cards/b/Blistergrub.java b/Mage.Sets/src/mage/cards/b/Blistergrub.java index e2482efdc0b..5dde249652f 100644 --- a/Mage.Sets/src/mage/cards/b/Blistergrub.java +++ b/Mage.Sets/src/mage/cards/b/Blistergrub.java @@ -28,15 +28,15 @@ package mage.cards.b; -import java.util.UUID; - -import mage.abilities.effects.common.LoseLifeOpponentsEffect; -import mage.abilities.keyword.SwampwalkAbility; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.effects.common.LoseLifeOpponentsEffect; +import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlisteringBarrier.java b/Mage.Sets/src/mage/cards/b/BlisteringBarrier.java index 37601d4462a..baf5296896f 100644 --- a/Mage.Sets/src/mage/cards/b/BlisteringBarrier.java +++ b/Mage.Sets/src/mage/cards/b/BlisteringBarrier.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java b/Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java index e9301d9e155..2a5feb0a49b 100644 --- a/Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java +++ b/Mage.Sets/src/mage/cards/b/BlisteringDieflyn.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +34,11 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java b/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java index ad67fbe332c..432498831d2 100644 --- a/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java +++ b/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java @@ -27,19 +27,20 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; -import mage.abilities.keyword.TrampleAbility; -import mage.abilities.keyword.HasteAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.SacrificeSourceEffect; +import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.MorphAbility; +import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Blisterpod.java b/Mage.Sets/src/mage/cards/b/Blisterpod.java index eaae5b653fa..d0bca49b417 100644 --- a/Mage.Sets/src/mage/cards/b/Blisterpod.java +++ b/Mage.Sets/src/mage/cards/b/Blisterpod.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.Effect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.EldraziScionToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlisterstickShaman.java b/Mage.Sets/src/mage/cards/b/BlisterstickShaman.java index 02bcbefa7e6..174fe948b4d 100644 --- a/Mage.Sets/src/mage/cards/b/BlisterstickShaman.java +++ b/Mage.Sets/src/mage/cards/b/BlisterstickShaman.java @@ -28,16 +28,17 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BlitzHellion.java b/Mage.Sets/src/mage/cards/b/BlitzHellion.java index 970da3de244..eaa24b035a3 100644 --- a/Mage.Sets/src/mage/cards/b/BlitzHellion.java +++ b/Mage.Sets/src/mage/cards/b/BlitzHellion.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,7 +35,11 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.TargetController; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlizzardElemental.java b/Mage.Sets/src/mage/cards/b/BlizzardElemental.java index 03bd03e4248..9b83bb50e14 100644 --- a/Mage.Sets/src/mage/cards/b/BlizzardElemental.java +++ b/Mage.Sets/src/mage/cards/b/BlizzardElemental.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java b/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java index 8e9c2fc4b11..2142baf4264 100644 --- a/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java +++ b/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; @@ -47,6 +47,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author anonymous @@ -55,7 +57,7 @@ public class BlizzardSpecter extends CardImpl { public BlizzardSpecter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{B}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Specter"); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/b/BloatedToad.java b/Mage.Sets/src/mage/cards/b/BloatedToad.java index 49cb0db1785..3c8c0e77c30 100644 --- a/Mage.Sets/src/mage/cards/b/BloatedToad.java +++ b/Mage.Sets/src/mage/cards/b/BloatedToad.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,6 +34,9 @@ import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlockadeRunner.java b/Mage.Sets/src/mage/cards/b/BlockadeRunner.java index 60b6fd0c002..c929b1191af 100644 --- a/Mage.Sets/src/mage/cards/b/BlockadeRunner.java +++ b/Mage.Sets/src/mage/cards/b/BlockadeRunner.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author djbrez diff --git a/Mage.Sets/src/mage/cards/b/Blockbuster.java b/Mage.Sets/src/mage/cards/b/Blockbuster.java index 5023ecbfdf6..f688ba172a7 100644 --- a/Mage.Sets/src/mage/cards/b/Blockbuster.java +++ b/Mage.Sets/src/mage/cards/b/Blockbuster.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BloodArtist.java b/Mage.Sets/src/mage/cards/b/BloodArtist.java index 4b9f1ed0c22..e852e03fd5f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodArtist.java +++ b/Mage.Sets/src/mage/cards/b/BloodArtist.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.Target; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/b/BloodBairn.java b/Mage.Sets/src/mage/cards/b/BloodBairn.java index e3cc66a8b33..a9a14a02c80 100644 --- a/Mage.Sets/src/mage/cards/b/BloodBairn.java +++ b/Mage.Sets/src/mage/cards/b/BloodBairn.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodBaronOfVizkopa.java b/Mage.Sets/src/mage/cards/b/BloodBaronOfVizkopa.java index 014b9ea2365..e3456d7155d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodBaronOfVizkopa.java +++ b/Mage.Sets/src/mage/cards/b/BloodBaronOfVizkopa.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,16 +37,13 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + public class BloodBaronOfVizkopa extends CardImpl { public BloodBaronOfVizkopa(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodCelebrant.java b/Mage.Sets/src/mage/cards/b/BloodCelebrant.java index 51ab6d63ed4..0e70752ddd5 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCelebrant.java +++ b/Mage.Sets/src/mage/cards/b/BloodCelebrant.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.common.PayLifeCost; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java index 782ffcc778c..be504b13a7d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java +++ b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BloodChinRager.java b/Mage.Sets/src/mage/cards/b/BloodChinRager.java index 3731a5e4f17..51e0c08b7cd 100644 --- a/Mage.Sets/src/mage/cards/b/BloodChinRager.java +++ b/Mage.Sets/src/mage/cards/b/BloodChinRager.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -40,6 +39,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodClock.java b/Mage.Sets/src/mage/cards/b/BloodClock.java index 4dbc36dfe79..38850779080 100644 --- a/Mage.Sets/src/mage/cards/b/BloodClock.java +++ b/Mage.Sets/src/mage/cards/b/BloodClock.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -43,6 +42,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodCrypt.java b/Mage.Sets/src/mage/cards/b/BloodCrypt.java index 7fa0064e640..98470fd2c2e 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCrypt.java +++ b/Mage.Sets/src/mage/cards/b/BloodCrypt.java @@ -28,8 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -37,6 +35,9 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodCultist.java b/Mage.Sets/src/mage/cards/b/BloodCultist.java index 40964cc35ea..11a80c23e7b 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCultist.java +++ b/Mage.Sets/src/mage/cards/b/BloodCultist.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java b/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java index ed5d4c25b57..ac2a19aec85 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java +++ b/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledEnchantmentPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BloodFeud.java b/Mage.Sets/src/mage/cards/b/BloodFeud.java index 565f0717938..d9b5c778154 100644 --- a/Mage.Sets/src/mage/cards/b/BloodFeud.java +++ b/Mage.Sets/src/mage/cards/b/BloodFeud.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.FightTargetsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherTargetPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author intimidatingant diff --git a/Mage.Sets/src/mage/cards/b/BloodFrenzy.java b/Mage.Sets/src/mage/cards/b/BloodFrenzy.java index 68b0b3c1b85..a756b1e89b3 100644 --- a/Mage.Sets/src/mage/cards/b/BloodFrenzy.java +++ b/Mage.Sets/src/mage/cards/b/BloodFrenzy.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -35,16 +34,13 @@ import mage.abilities.effects.common.DestroyTargetAtBeginningOfNextEndStepEffect import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.TurnPhase; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BloodFunnel.java b/Mage.Sets/src/mage/cards/b/BloodFunnel.java index 6118ef717e4..61699ab22ab 100644 --- a/Mage.Sets/src/mage/cards/b/BloodFunnel.java +++ b/Mage.Sets/src/mage/cards/b/BloodFunnel.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BloodHost.java b/Mage.Sets/src/mage/cards/b/BloodHost.java index 208acb1f6b7..2b6bf81db6d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodHost.java +++ b/Mage.Sets/src/mage/cards/b/BloodHost.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BloodKnight.java b/Mage.Sets/src/mage/cards/b/BloodKnight.java index e13169e2f86..ddd8a3433d1 100644 --- a/Mage.Sets/src/mage/cards/b/BloodKnight.java +++ b/Mage.Sets/src/mage/cards/b/BloodKnight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FirstStrikeAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BloodLust.java b/Mage.Sets/src/mage/cards/b/BloodLust.java index 835f436c065..9bc2dc0ac90 100644 --- a/Mage.Sets/src/mage/cards/b/BloodLust.java +++ b/Mage.Sets/src/mage/cards/b/BloodLust.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BloodMist.java b/Mage.Sets/src/mage/cards/b/BloodMist.java index 783e7f48e70..b516bf51bf6 100644 --- a/Mage.Sets/src/mage/cards/b/BloodMist.java +++ b/Mage.Sets/src/mage/cards/b/BloodMist.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodMoon.java b/Mage.Sets/src/mage/cards/b/BloodMoon.java index 6088112e971..1893837119a 100644 --- a/Mage.Sets/src/mage/cards/b/BloodMoon.java +++ b/Mage.Sets/src/mage/cards/b/BloodMoon.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -35,18 +34,15 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.repository.CardRepository; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -75,7 +71,7 @@ class BloodMoonEffect extends ContinuousEffectImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); } BloodMoonEffect() { diff --git a/Mage.Sets/src/mage/cards/b/BloodOgre.java b/Mage.Sets/src/mage/cards/b/BloodOgre.java index 9712a8e04d3..b4a9d84967c 100644 --- a/Mage.Sets/src/mage/cards/b/BloodOgre.java +++ b/Mage.Sets/src/mage/cards/b/BloodOgre.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodPet.java b/Mage.Sets/src/mage/cards/b/BloodPet.java index 43b7120bd18..0132932d205 100644 --- a/Mage.Sets/src/mage/cards/b/BloodPet.java +++ b/Mage.Sets/src/mage/cards/b/BloodPet.java @@ -27,17 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BloodReckoning.java b/Mage.Sets/src/mage/cards/b/BloodReckoning.java index 15360b62bda..3a81e67bf2f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodReckoning.java +++ b/Mage.Sets/src/mage/cards/b/BloodReckoning.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.AttacksAllTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.SetTargetPointer; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BloodRites.java b/Mage.Sets/src/mage/cards/b/BloodRites.java index 8435c288b65..f8062a97df3 100644 --- a/Mage.Sets/src/mage/cards/b/BloodRites.java +++ b/Mage.Sets/src/mage/cards/b/BloodRites.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,10 +35,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BloodScrivener.java b/Mage.Sets/src/mage/cards/b/BloodScrivener.java index eb6256e7787..2486588eaf8 100644 --- a/Mage.Sets/src/mage/cards/b/BloodScrivener.java +++ b/Mage.Sets/src/mage/cards/b/BloodScrivener.java @@ -28,21 +28,22 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodSeeker.java b/Mage.Sets/src/mage/cards/b/BloodSeeker.java index 03b76a26625..5b7b35a5bc0 100644 --- a/Mage.Sets/src/mage/cards/b/BloodSeeker.java +++ b/Mage.Sets/src/mage/cards/b/BloodSeeker.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BloodSpeaker.java b/Mage.Sets/src/mage/cards/b/BloodSpeaker.java index 1bfd7bce99f..57bc50da82b 100644 --- a/Mage.Sets/src/mage/cards/b/BloodSpeaker.java +++ b/Mage.Sets/src/mage/cards/b/BloodSpeaker.java @@ -28,10 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,12 +37,16 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodTithe.java b/Mage.Sets/src/mage/cards/b/BloodTithe.java index 88d3237b9d3..bf8b86c39af 100644 --- a/Mage.Sets/src/mage/cards/b/BloodTithe.java +++ b/Mage.Sets/src/mage/cards/b/BloodTithe.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BloodTollHarpy.java b/Mage.Sets/src/mage/cards/b/BloodTollHarpy.java index eb069706ddd..f570678ce8e 100644 --- a/Mage.Sets/src/mage/cards/b/BloodTollHarpy.java +++ b/Mage.Sets/src/mage/cards/b/BloodTollHarpy.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodTribute.java b/Mage.Sets/src/mage/cards/b/BloodTribute.java index 75e34cd69fd..f6130c8cfe5 100644 --- a/Mage.Sets/src/mage/cards/b/BloodTribute.java +++ b/Mage.Sets/src/mage/cards/b/BloodTribute.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; import mage.abilities.costs.common.TapTargetCost; @@ -39,6 +36,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BloodTyrant.java b/Mage.Sets/src/mage/cards/b/BloodTyrant.java index effe6402bf9..dfa6e3c5dab 100644 --- a/Mage.Sets/src/mage/cards/b/BloodTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BloodTyrant.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -49,6 +48,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BloodVassal.java b/Mage.Sets/src/mage/cards/b/BloodVassal.java index ef16ea0e6d0..ad0cc51902d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodVassal.java +++ b/Mage.Sets/src/mage/cards/b/BloodVassal.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** diff --git a/Mage.Sets/src/mage/cards/b/BloodbondMarch.java b/Mage.Sets/src/mage/cards/b/BloodbondMarch.java index da7b086ba98..ee7d27b6f59 100644 --- a/Mage.Sets/src/mage/cards/b/BloodbondMarch.java +++ b/Mage.Sets/src/mage/cards/b/BloodbondMarch.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; +import java.util.UUID; + /** * * @author JRHerlehy diff --git a/Mage.Sets/src/mage/cards/b/BloodbondVampire.java b/Mage.Sets/src/mage/cards/b/BloodbondVampire.java index 45bcc169f15..b3ede615f42 100644 --- a/Mage.Sets/src/mage/cards/b/BloodbondVampire.java +++ b/Mage.Sets/src/mage/cards/b/BloodbondVampire.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.GainLifeControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodbraidElf.java b/Mage.Sets/src/mage/cards/b/BloodbraidElf.java index 7b74545377c..9be47ff59c7 100644 --- a/Mage.Sets/src/mage/cards/b/BloodbraidElf.java +++ b/Mage.Sets/src/mage/cards/b/BloodbraidElf.java @@ -28,13 +28,14 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.CascadeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** diff --git a/Mage.Sets/src/mage/cards/b/Bloodbriar.java b/Mage.Sets/src/mage/cards/b/Bloodbriar.java index fa0f4175ebb..d73174c7403 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodbriar.java +++ b/Mage.Sets/src/mage/cards/b/Bloodbriar.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SacrificeAllTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -40,6 +39,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodchiefAscension.java b/Mage.Sets/src/mage/cards/b/BloodchiefAscension.java index ba0828d2e2e..0100501110f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodchiefAscension.java +++ b/Mage.Sets/src/mage/cards/b/BloodchiefAscension.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; @@ -47,6 +46,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java b/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java index 7267931ec74..c3afe951675 100644 --- a/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java +++ b/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.watchers.common.BloodthirstWatcher; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java b/Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java index d14d4f2c11c..42c3a3cc299 100644 --- a/Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java +++ b/Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -47,6 +46,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodcrazedNeonate.java b/Mage.Sets/src/mage/cards/b/BloodcrazedNeonate.java index a86c6baa6b7..509cd1c3f87 100644 --- a/Mage.Sets/src/mage/cards/b/BloodcrazedNeonate.java +++ b/Mage.Sets/src/mage/cards/b/BloodcrazedNeonate.java @@ -27,16 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/Bloodcurdler.java b/Mage.Sets/src/mage/cards/b/Bloodcurdler.java index 5ac9f33270d..1d29da4a34a 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodcurdler.java +++ b/Mage.Sets/src/mage/cards/b/Bloodcurdler.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -44,11 +43,9 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodcurdlingScream.java b/Mage.Sets/src/mage/cards/b/BloodcurdlingScream.java index e8bd1f841a5..1fa46759a23 100644 --- a/Mage.Sets/src/mage/cards/b/BloodcurdlingScream.java +++ b/Mage.Sets/src/mage/cards/b/BloodcurdlingScream.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ExileFromHandCostCardConvertedMana; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BloodfellCaves.java b/Mage.Sets/src/mage/cards/b/BloodfellCaves.java index 6f6d9040550..e430f3b066f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfellCaves.java +++ b/Mage.Sets/src/mage/cards/b/BloodfellCaves.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodfireColossus.java b/Mage.Sets/src/mage/cards/b/BloodfireColossus.java index 98639ae8fac..e8ba045fcdd 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireColossus.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireColossus.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +36,12 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BloodfireDwarf.java b/Mage.Sets/src/mage/cards/b/BloodfireDwarf.java index bb9c79453e5..2bc46a0882d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireDwarf.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireDwarf.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,12 +37,15 @@ import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java b/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java index f173eb7def5..2446a8f7c4d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterInstantOrSorceryCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodfireExpert.java b/Mage.Sets/src/mage/cards/b/BloodfireExpert.java index ed976bb029f..392d5114efb 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireExpert.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireExpert.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ProwessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodfireKavu.java b/Mage.Sets/src/mage/cards/b/BloodfireKavu.java index fc866434949..0fa6e79f4c1 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireKavu.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireKavu.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,10 +36,13 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BloodfireMentor.java b/Mage.Sets/src/mage/cards/b/BloodfireMentor.java index f54eb614cf3..b0780f761d9 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireMentor.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireMentor.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java b/Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java index 0a81caa3522..093cc4183db 100644 --- a/Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java +++ b/Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -36,6 +35,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/b/BloodfrayGiant.java b/Mage.Sets/src/mage/cards/b/BloodfrayGiant.java index 3ae86662f82..6aa2d2d4506 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfrayGiant.java +++ b/Mage.Sets/src/mage/cards/b/BloodfrayGiant.java @@ -26,14 +26,15 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.b; - -import java.util.UUID; -import mage.constants.CardType; + import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Bloodghast.java b/Mage.Sets/src/mage/cards/b/Bloodghast.java index dd4e294a0b7..7bd5f898b13 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodghast.java +++ b/Mage.Sets/src/mage/cards/b/Bloodghast.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.LandfallAbility; @@ -43,6 +39,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodgiftDemon.java b/Mage.Sets/src/mage/cards/b/BloodgiftDemon.java index a79f1fafb88..d30d7d28fc2 100644 --- a/Mage.Sets/src/mage/cards/b/BloodgiftDemon.java +++ b/Mage.Sets/src/mage/cards/b/BloodgiftDemon.java @@ -27,20 +27,20 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.events.GameEvent.EventType; import mage.target.TargetPlayer; import java.util.UUID; -import mage.abilities.effects.Effect; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodhallOoze.java b/Mage.Sets/src/mage/cards/b/BloodhallOoze.java index 77b238ff0f3..011fab78d18 100644 --- a/Mage.Sets/src/mage/cards/b/BloodhallOoze.java +++ b/Mage.Sets/src/mage/cards/b/BloodhallOoze.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author loki diff --git a/Mage.Sets/src/mage/cards/b/BloodhallPriest.java b/Mage.Sets/src/mage/cards/b/BloodhallPriest.java index 470e643c6d2..9a0859a9bca 100644 --- a/Mage.Sets/src/mage/cards/b/BloodhallPriest.java +++ b/Mage.Sets/src/mage/cards/b/BloodhallPriest.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BloodhunterBat.java b/Mage.Sets/src/mage/cards/b/BloodhunterBat.java index 945f8526efa..bc80f312edc 100644 --- a/Mage.Sets/src/mage/cards/b/BloodhunterBat.java +++ b/Mage.Sets/src/mage/cards/b/BloodhunterBat.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,8 +35,11 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BloodhuskRitualist.java b/Mage.Sets/src/mage/cards/b/BloodhuskRitualist.java index b163edbed28..7441dd9d23b 100644 --- a/Mage.Sets/src/mage/cards/b/BloodhuskRitualist.java +++ b/Mage.Sets/src/mage/cards/b/BloodhuskRitualist.java @@ -28,8 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,8 +36,11 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BloodiedGhost.java b/Mage.Sets/src/mage/cards/b/BloodiedGhost.java index f62b7695cc9..2938030036c 100644 --- a/Mage.Sets/src/mage/cards/b/BloodiedGhost.java +++ b/Mage.Sets/src/mage/cards/b/BloodiedGhost.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java index ca75d6b74de..35f446cc724 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java +++ b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -40,15 +39,17 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransformAbility; -import mage.cards.l.LordOfLineage; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.l.LordOfLineage; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BloodlineShaman.java b/Mage.Sets/src/mage/cards/b/BloodlineShaman.java index 753f52cceea..bcfb5017d98 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlineShaman.java +++ b/Mage.Sets/src/mage/cards/b/BloodlineShaman.java @@ -27,18 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; @@ -50,6 +45,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java b/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java index f9fcc6aaf5e..9d28a122696 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java +++ b/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -36,11 +35,7 @@ import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/b/BloodmadVampire.java b/Mage.Sets/src/mage/cards/b/BloodmadVampire.java index fe528b46850..2e6f166cc0d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodmadVampire.java +++ b/Mage.Sets/src/mage/cards/b/BloodmadVampire.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java b/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java index 2ab9ae8112b..b07fc1c0817 100644 --- a/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java +++ b/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -38,9 +34,14 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BloodpyreElemental.java b/Mage.Sets/src/mage/cards/b/BloodpyreElemental.java index eac06c800c0..a292c764a9f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodpyreElemental.java +++ b/Mage.Sets/src/mage/cards/b/BloodpyreElemental.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -37,9 +34,12 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BloodrageVampire.java b/Mage.Sets/src/mage/cards/b/BloodrageVampire.java index 72547c863e3..5750fd1cd73 100644 --- a/Mage.Sets/src/mage/cards/b/BloodrageVampire.java +++ b/Mage.Sets/src/mage/cards/b/BloodrageVampire.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodriteInvoker.java b/Mage.Sets/src/mage/cards/b/BloodriteInvoker.java index 2ea66d72187..7d9f9f9f6c8 100644 --- a/Mage.Sets/src/mage/cards/b/BloodriteInvoker.java +++ b/Mage.Sets/src/mage/cards/b/BloodriteInvoker.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +36,12 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BloodrockCyclops.java b/Mage.Sets/src/mage/cards/b/BloodrockCyclops.java index 6a463b2153e..6dedc7511dc 100644 --- a/Mage.Sets/src/mage/cards/b/BloodrockCyclops.java +++ b/Mage.Sets/src/mage/cards/b/BloodrockCyclops.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodscaleProwler.java b/Mage.Sets/src/mage/cards/b/BloodscaleProwler.java index 69599b0493e..032b9436136 100644 --- a/Mage.Sets/src/mage/cards/b/BloodscaleProwler.java +++ b/Mage.Sets/src/mage/cards/b/BloodscaleProwler.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/b/Bloodscent.java b/Mage.Sets/src/mage/cards/b/Bloodscent.java index 2f1d02f9daa..d85557b81d6 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodscent.java +++ b/Mage.Sets/src/mage/cards/b/Bloodscent.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.combat.MustBeBlockedByAllTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BloodshedFever.java b/Mage.Sets/src/mage/cards/b/BloodshedFever.java index 4a3b3c35dce..e32ccb27c4e 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshedFever.java +++ b/Mage.Sets/src/mage/cards/b/BloodshedFever.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -35,14 +34,12 @@ import mage.abilities.effects.common.combat.AttacksIfAbleAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java index 3a32943848e..27cae769747 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java +++ b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BloodshotTrainee.java b/Mage.Sets/src/mage/cards/b/BloodshotTrainee.java index dacf940b21f..46b16db38f7 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshotTrainee.java +++ b/Mage.Sets/src/mage/cards/b/BloodshotTrainee.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,10 +36,14 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java b/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java index 79bba0a6915..b910c226f40 100644 --- a/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java +++ b/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.watchers.common.PlayerAttackedWatcher; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java b/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java index 111287c4d78..0f3d828e356 100644 --- a/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java +++ b/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BloodstainedMire.java b/Mage.Sets/src/mage/cards/b/BloodstainedMire.java index 82db75842b1..fcf584bd202 100644 --- a/Mage.Sets/src/mage/cards/b/BloodstainedMire.java +++ b/Mage.Sets/src/mage/cards/b/BloodstainedMire.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; -import mage.constants.CardType; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BloodstoneCameo.java b/Mage.Sets/src/mage/cards/b/BloodstoneCameo.java index 047225bf68a..e81e53ff115 100644 --- a/Mage.Sets/src/mage/cards/b/BloodstoneCameo.java +++ b/Mage.Sets/src/mage/cards/b/BloodstoneCameo.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java b/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java index cf0f9597f52..90ca2567e89 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java +++ b/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -49,6 +48,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java b/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java index 7125972abe5..7ee15786aef 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java +++ b/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,11 +34,16 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BloodthroneVampire.java b/Mage.Sets/src/mage/cards/b/BloodthroneVampire.java index 55188108dd3..468057499e8 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/cards/b/BloodthroneVampire.java @@ -28,18 +28,19 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BloomTender.java b/Mage.Sets/src/mage/cards/b/BloomTender.java index 60e9975b1df..bfacf36dcd4 100644 --- a/Mage.Sets/src/mage/cards/b/BloomTender.java +++ b/Mage.Sets/src/mage/cards/b/BloomTender.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BloomingMarsh.java b/Mage.Sets/src/mage/cards/b/BloomingMarsh.java index 257700f891b..48fe128a99e 100644 --- a/Mage.Sets/src/mage/cards/b/BloomingMarsh.java +++ b/Mage.Sets/src/mage/cards/b/BloomingMarsh.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -43,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlossomingDefense.java b/Mage.Sets/src/mage/cards/b/BlossomingDefense.java index 72d3d62309d..74b0c453bad 100644 --- a/Mage.Sets/src/mage/cards/b/BlossomingDefense.java +++ b/Mage.Sets/src/mage/cards/b/BlossomingDefense.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BlossomingSands.java b/Mage.Sets/src/mage/cards/b/BlossomingSands.java index ccdd1ea1f0b..cedb44adac5 100644 --- a/Mage.Sets/src/mage/cards/b/BlossomingSands.java +++ b/Mage.Sets/src/mage/cards/b/BlossomingSands.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BlowflyInfestation.java b/Mage.Sets/src/mage/cards/b/BlowflyInfestation.java index ae4980f72cd..2bac40307b2 100644 --- a/Mage.Sets/src/mage/cards/b/BlowflyInfestation.java +++ b/Mage.Sets/src/mage/cards/b/BlowflyInfestation.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * diff --git a/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java b/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java index 8bb2c7eb5a9..07eaf6f5e6d 100644 --- a/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java +++ b/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,12 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -53,6 +46,9 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.List; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BlueElementalBlast.java b/Mage.Sets/src/mage/cards/b/BlueElementalBlast.java index dbd1f888cf7..71fc6796e53 100644 --- a/Mage.Sets/src/mage/cards/b/BlueElementalBlast.java +++ b/Mage.Sets/src/mage/cards/b/BlueElementalBlast.java @@ -27,20 +27,21 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BlueScarab.java b/Mage.Sets/src/mage/cards/b/BlueScarab.java index 277839674ad..d4dd91bea4c 100644 --- a/Mage.Sets/src/mage/cards/b/BlueScarab.java +++ b/Mage.Sets/src/mage/cards/b/BlueScarab.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,17 +39,15 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Zeplar1_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BlueSunsZenith.java b/Mage.Sets/src/mage/cards/b/BlueSunsZenith.java index 78a8e869d22..309497abb23 100644 --- a/Mage.Sets/src/mage/cards/b/BlueSunsZenith.java +++ b/Mage.Sets/src/mage/cards/b/BlueSunsZenith.java @@ -28,15 +28,16 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BlueWard.java b/Mage.Sets/src/mage/cards/b/BlueWard.java index 8985ef36c33..563eb426c5b 100644 --- a/Mage.Sets/src/mage/cards/b/BlueWard.java +++ b/Mage.Sets/src/mage/cards/b/BlueWard.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BluntTheAssault.java b/Mage.Sets/src/mage/cards/b/BluntTheAssault.java index 6733f1542b0..9f81a918909 100644 --- a/Mage.Sets/src/mage/cards/b/BluntTheAssault.java +++ b/Mage.Sets/src/mage/cards/b/BluntTheAssault.java @@ -28,17 +28,17 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BlurSliver.java b/Mage.Sets/src/mage/cards/b/BlurSliver.java index 251ead76d9e..d78e0568c67 100644 --- a/Mage.Sets/src/mage/cards/b/BlurSliver.java +++ b/Mage.Sets/src/mage/cards/b/BlurSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BlurredMongoose.java b/Mage.Sets/src/mage/cards/b/BlurredMongoose.java index accab87c13d..cd83f8f7cdc 100644 --- a/Mage.Sets/src/mage/cards/b/BlurredMongoose.java +++ b/Mage.Sets/src/mage/cards/b/BlurredMongoose.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.CantBeCounteredAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Blustersquall.java b/Mage.Sets/src/mage/cards/b/Blustersquall.java index fedc75aa678..4002b73d36c 100644 --- a/Mage.Sets/src/mage/cards/b/Blustersquall.java +++ b/Mage.Sets/src/mage/cards/b/Blustersquall.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -37,6 +34,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; @@ -45,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/b/BoarUmbra.java b/Mage.Sets/src/mage/cards/b/BoarUmbra.java index d06dd0e4e98..9bbac9cc4de 100644 --- a/Mage.Sets/src/mage/cards/b/BoarUmbra.java +++ b/Mage.Sets/src/mage/cards/b/BoarUmbra.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -38,9 +35,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TotemArmorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BoartuskLiege.java b/Mage.Sets/src/mage/cards/b/BoartuskLiege.java index e658da1cc74..5bdf59d1404 100644 --- a/Mage.Sets/src/mage/cards/b/BoartuskLiege.java +++ b/Mage.Sets/src/mage/cards/b/BoartuskLiege.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -38,9 +34,14 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BobaFett.java b/Mage.Sets/src/mage/cards/b/BobaFett.java index 0d043f00f4b..add581b5d65 100644 --- a/Mage.Sets/src/mage/cards/b/BobaFett.java +++ b/Mage.Sets/src/mage/cards/b/BobaFett.java @@ -27,22 +27,24 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.BountyAbility; -import mage.abilities.keyword.MenaceAbility; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.HasteAbility; +import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; import mage.target.common.TargetOpponentsCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -51,7 +53,7 @@ public class BobaFett extends CardImpl { public BobaFett(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Hunter"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/b/BodyDouble.java b/Mage.Sets/src/mage/cards/b/BodyDouble.java index c9bafb6f701..ddbbdf46361 100644 --- a/Mage.Sets/src/mage/cards/b/BodyDouble.java +++ b/Mage.Sets/src/mage/cards/b/BodyDouble.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BodyOfJukai.java b/Mage.Sets/src/mage/cards/b/BodyOfJukai.java index 76036776617..33b025b3515 100644 --- a/Mage.Sets/src/mage/cards/b/BodyOfJukai.java +++ b/Mage.Sets/src/mage/cards/b/BodyOfJukai.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.SoulshiftAbility; +import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BodySnatcher.java b/Mage.Sets/src/mage/cards/b/BodySnatcher.java index ae40cbe9764..651f1770bec 100644 --- a/Mage.Sets/src/mage/cards/b/BodySnatcher.java +++ b/Mage.Sets/src/mage/cards/b/BodySnatcher.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BogDown.java b/Mage.Sets/src/mage/cards/b/BogDown.java index 79f1cf5b915..e5321b3ccbc 100644 --- a/Mage.Sets/src/mage/cards/b/BogDown.java +++ b/Mage.Sets/src/mage/cards/b/BogDown.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.common.KickedCondition; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BogElemental.java b/Mage.Sets/src/mage/cards/b/BogElemental.java index 70563818523..e50a06e2c64 100644 --- a/Mage.Sets/src/mage/cards/b/BogElemental.java +++ b/Mage.Sets/src/mage/cards/b/BogElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BogGlider.java b/Mage.Sets/src/mage/cards/b/BogGlider.java index f6f9ab98779..676edde422a 100644 --- a/Mage.Sets/src/mage/cards/b/BogGlider.java +++ b/Mage.Sets/src/mage/cards/b/BogGlider.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +36,8 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -48,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BogGnarr.java b/Mage.Sets/src/mage/cards/b/BogGnarr.java index e936fc6db20..73ddce37a42 100644 --- a/Mage.Sets/src/mage/cards/b/BogGnarr.java +++ b/Mage.Sets/src/mage/cards/b/BogGnarr.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastAllTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BogHoodlums.java b/Mage.Sets/src/mage/cards/b/BogHoodlums.java index 3db05c7b42e..72e84f44592 100644 --- a/Mage.Sets/src/mage/cards/b/BogHoodlums.java +++ b/Mage.Sets/src/mage/cards/b/BogHoodlums.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BogImp.java b/Mage.Sets/src/mage/cards/b/BogImp.java index f4a98698f51..d5e3de5ab8f 100644 --- a/Mage.Sets/src/mage/cards/b/BogImp.java +++ b/Mage.Sets/src/mage/cards/b/BogImp.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BogInitiate.java b/Mage.Sets/src/mage/cards/b/BogInitiate.java index 693ce9d5403..ddc9c2aeea4 100644 --- a/Mage.Sets/src/mage/cards/b/BogInitiate.java +++ b/Mage.Sets/src/mage/cards/b/BogInitiate.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BogRaiders.java b/Mage.Sets/src/mage/cards/b/BogRaiders.java index 50db7be5448..01e7cdb26b3 100644 --- a/Mage.Sets/src/mage/cards/b/BogRaiders.java +++ b/Mage.Sets/src/mage/cards/b/BogRaiders.java @@ -28,12 +28,13 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BogRats.java b/Mage.Sets/src/mage/cards/b/BogRats.java index 438a01ee660..2a3c675ac4d 100644 --- a/Mage.Sets/src/mage/cards/b/BogRats.java +++ b/Mage.Sets/src/mage/cards/b/BogRats.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BogSerpent.java b/Mage.Sets/src/mage/cards/b/BogSerpent.java index d3d0256c8d9..70bc72274b2 100644 --- a/Mage.Sets/src/mage/cards/b/BogSerpent.java +++ b/Mage.Sets/src/mage/cards/b/BogSerpent.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BogSmugglers.java b/Mage.Sets/src/mage/cards/b/BogSmugglers.java index f8fd1770be9..92aa1aede84 100644 --- a/Mage.Sets/src/mage/cards/b/BogSmugglers.java +++ b/Mage.Sets/src/mage/cards/b/BogSmugglers.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BogStriderAsh.java b/Mage.Sets/src/mage/cards/b/BogStriderAsh.java index 55036c1e8f8..10df9f84751 100644 --- a/Mage.Sets/src/mage/cards/b/BogStriderAsh.java +++ b/Mage.Sets/src/mage/cards/b/BogStriderAsh.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.MageInt; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +39,8 @@ import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author EvilGeek diff --git a/Mage.Sets/src/mage/cards/b/BogTatters.java b/Mage.Sets/src/mage/cards/b/BogTatters.java index 403992645e6..1da3ac27a0f 100644 --- a/Mage.Sets/src/mage/cards/b/BogTatters.java +++ b/Mage.Sets/src/mage/cards/b/BogTatters.java @@ -28,12 +28,13 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BogWitch.java b/Mage.Sets/src/mage/cards/b/BogWitch.java index 4d446b1d5ba..1a6589b76c1 100644 --- a/Mage.Sets/src/mage/cards/b/BogWitch.java +++ b/Mage.Sets/src/mage/cards/b/BogWitch.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BogWraith.java b/Mage.Sets/src/mage/cards/b/BogWraith.java index 30459554998..dde74e3553d 100644 --- a/Mage.Sets/src/mage/cards/b/BogWraith.java +++ b/Mage.Sets/src/mage/cards/b/BogWraith.java @@ -28,12 +28,13 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BogWreckage.java b/Mage.Sets/src/mage/cards/b/BogWreckage.java index e076cacd650..8ae561fffdd 100644 --- a/Mage.Sets/src/mage/cards/b/BogWreckage.java +++ b/Mage.Sets/src/mage/cards/b/BogWreckage.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BogardanFirefiend.java b/Mage.Sets/src/mage/cards/b/BogardanFirefiend.java index 0c955b2fc5f..97b609be31f 100644 --- a/Mage.Sets/src/mage/cards/b/BogardanFirefiend.java +++ b/Mage.Sets/src/mage/cards/b/BogardanFirefiend.java @@ -27,16 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BogardanHellkite.java b/Mage.Sets/src/mage/cards/b/BogardanHellkite.java index 7cd864bd693..58b42fed4f9 100644 --- a/Mage.Sets/src/mage/cards/b/BogardanHellkite.java +++ b/Mage.Sets/src/mage/cards/b/BogardanHellkite.java @@ -28,8 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,8 +36,11 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BogardanLancer.java b/Mage.Sets/src/mage/cards/b/BogardanLancer.java index 68ae2695c32..7cfa73979f2 100644 --- a/Mage.Sets/src/mage/cards/b/BogardanLancer.java +++ b/Mage.Sets/src/mage/cards/b/BogardanLancer.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FlankingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BogardanRager.java b/Mage.Sets/src/mage/cards/b/BogardanRager.java index 059cb21ed25..e8bad9dd7e1 100644 --- a/Mage.Sets/src/mage/cards/b/BogardanRager.java +++ b/Mage.Sets/src/mage/cards/b/BogardanRager.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java index 53f53dc6d8a..12c3f33c31d 100644 --- a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java +++ b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoggartArsonists.java b/Mage.Sets/src/mage/cards/b/BoggartArsonists.java index e19bc0a33f7..c03dbfb4de9 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartArsonists.java +++ b/Mage.Sets/src/mage/cards/b/BoggartArsonists.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java b/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java index 2fcf5127337..1e83479996c 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java +++ b/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java @@ -27,13 +27,13 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; -import mage.target.common.TargetCardInYourGraveyard; import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BoggartBrute.java b/Mage.Sets/src/mage/cards/b/BoggartBrute.java index c2165670936..ea2cc38adc4 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartBrute.java +++ b/Mage.Sets/src/mage/cards/b/BoggartBrute.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoggartForager.java b/Mage.Sets/src/mage/cards/b/BoggartForager.java index a1ae83ce9f8..b00a642bc14 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartForager.java +++ b/Mage.Sets/src/mage/cards/b/BoggartForager.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/b/BoggartHarbinger.java b/Mage.Sets/src/mage/cards/b/BoggartHarbinger.java index 6f206e6411a..6db78c932a2 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartHarbinger.java +++ b/Mage.Sets/src/mage/cards/b/BoggartHarbinger.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; @@ -38,6 +37,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/b/BoggartLoggers.java b/Mage.Sets/src/mage/cards/b/BoggartLoggers.java index cc2d31299c2..fe989000600 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartLoggers.java +++ b/Mage.Sets/src/mage/cards/b/BoggartLoggers.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BoggartMob.java b/Mage.Sets/src/mage/cards/b/BoggartMob.java index 384899f394d..a2c74a48579 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartMob.java +++ b/Mage.Sets/src/mage/cards/b/BoggartMob.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinRogueToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BoggartRamGang.java b/Mage.Sets/src/mage/cards/b/BoggartRamGang.java index 081eff85c9d..d0ad3b791cb 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartRamGang.java +++ b/Mage.Sets/src/mage/cards/b/BoggartRamGang.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java b/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java index 02fdaf83051..618bf9549a7 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java +++ b/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java b/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java index 027dfc95f67..24fd2c94d38 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java +++ b/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/b/Boil.java b/Mage.Sets/src/mage/cards/b/Boil.java index 9077af8e164..82771100200 100644 --- a/Mage.Sets/src/mage/cards/b/Boil.java +++ b/Mage.Sets/src/mage/cards/b/Boil.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BoilingBlood.java b/Mage.Sets/src/mage/cards/b/BoilingBlood.java index eb10f3423d2..17db3b12fb3 100644 --- a/Mage.Sets/src/mage/cards/b/BoilingBlood.java +++ b/Mage.Sets/src/mage/cards/b/BoilingBlood.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.combat.AttacksIfAbleTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BoilingEarth.java b/Mage.Sets/src/mage/cards/b/BoilingEarth.java index fb255160561..9341f91347f 100644 --- a/Mage.Sets/src/mage/cards/b/BoilingEarth.java +++ b/Mage.Sets/src/mage/cards/b/BoilingEarth.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.AwakenAbility; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoilingSeas.java b/Mage.Sets/src/mage/cards/b/BoilingSeas.java index e851a363fbc..c248ccfa3e0 100644 --- a/Mage.Sets/src/mage/cards/b/BoilingSeas.java +++ b/Mage.Sets/src/mage/cards/b/BoilingSeas.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BojukaBog.java b/Mage.Sets/src/mage/cards/b/BojukaBog.java index 86439be6887..025068d2d4e 100644 --- a/Mage.Sets/src/mage/cards/b/BojukaBog.java +++ b/Mage.Sets/src/mage/cards/b/BojukaBog.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ExileGraveyardAllTargetPlayerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BojukaBrigand.java b/Mage.Sets/src/mage/cards/b/BojukaBrigand.java index ada9292f29b..7ab965a5913 100644 --- a/Mage.Sets/src/mage/cards/b/BojukaBrigand.java +++ b/Mage.Sets/src/mage/cards/b/BojukaBrigand.java @@ -27,16 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.common.CantBlockAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BoldDefense.java b/Mage.Sets/src/mage/cards/b/BoldDefense.java index 3f309ee3211..32be186a43b 100644 --- a/Mage.Sets/src/mage/cards/b/BoldDefense.java +++ b/Mage.Sets/src/mage/cards/b/BoldDefense.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * @author nantuko, Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BoldImpaler.java b/Mage.Sets/src/mage/cards/b/BoldImpaler.java index 4beb2ce326f..c860383e40f 100644 --- a/Mage.Sets/src/mage/cards/b/BoldImpaler.java +++ b/Mage.Sets/src/mage/cards/b/BoldImpaler.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoldwyrHeavyweights.java b/Mage.Sets/src/mage/cards/b/BoldwyrHeavyweights.java index 828c5aca8ef..629b318bdab 100644 --- a/Mage.Sets/src/mage/cards/b/BoldwyrHeavyweights.java +++ b/Mage.Sets/src/mage/cards/b/BoldwyrHeavyweights.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,6 +43,10 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BoltOfKeranos.java b/Mage.Sets/src/mage/cards/b/BoltOfKeranos.java index 52acc39fb1d..e69dc000c73 100644 --- a/Mage.Sets/src/mage/cards/b/BoltOfKeranos.java +++ b/Mage.Sets/src/mage/cards/b/BoltOfKeranos.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java b/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java index 1fc0ff5e464..459dc8a6b8c 100644 --- a/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java +++ b/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BomatBazaarBarge.java b/Mage.Sets/src/mage/cards/b/BomatBazaarBarge.java index 7fa6c091b3d..eaf0569e668 100644 --- a/Mage.Sets/src/mage/cards/b/BomatBazaarBarge.java +++ b/Mage.Sets/src/mage/cards/b/BomatBazaarBarge.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BomatCourier.java b/Mage.Sets/src/mage/cards/b/BomatCourier.java index cb730430db0..3c50851850c 100644 --- a/Mage.Sets/src/mage/cards/b/BomatCourier.java +++ b/Mage.Sets/src/mage/cards/b/BomatCourier.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -50,6 +49,8 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BombSquad.java b/Mage.Sets/src/mage/cards/b/BombSquad.java index 6e9784a89c3..a1b7530fac5 100644 --- a/Mage.Sets/src/mage/cards/b/BombSquad.java +++ b/Mage.Sets/src/mage/cards/b/BombSquad.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -55,6 +54,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * 10/4/2004: If the creature regenerates, the fuse counters are still removed and * the four damage is still dealt. diff --git a/Mage.Sets/src/mage/cards/b/BomberCorps.java b/Mage.Sets/src/mage/cards/b/BomberCorps.java index 993876dd00c..95815e9f001 100644 --- a/Mage.Sets/src/mage/cards/b/BomberCorps.java +++ b/Mage.Sets/src/mage/cards/b/BomberCorps.java @@ -27,16 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.BattalionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BondBeetle.java b/Mage.Sets/src/mage/cards/b/BondBeetle.java index 875b081138f..85a78497c00 100644 --- a/Mage.Sets/src/mage/cards/b/BondBeetle.java +++ b/Mage.Sets/src/mage/cards/b/BondBeetle.java @@ -27,13 +27,13 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/b/BondedConstruct.java b/Mage.Sets/src/mage/cards/b/BondedConstruct.java index cc7888002d5..fe45a315cfb 100644 --- a/Mage.Sets/src/mage/cards/b/BondedConstruct.java +++ b/Mage.Sets/src/mage/cards/b/BondedConstruct.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.CantAttackAloneAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BondedFetch.java b/Mage.Sets/src/mage/cards/b/BondedFetch.java index 73508d248ec..03a95fc7b94 100644 --- a/Mage.Sets/src/mage/cards/b/BondedFetch.java +++ b/Mage.Sets/src/mage/cards/b/BondedFetch.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BondsOfFaith.java b/Mage.Sets/src/mage/cards/b/BondsOfFaith.java index a61432a02a8..4d8cf936074 100644 --- a/Mage.Sets/src/mage/cards/b/BondsOfFaith.java +++ b/Mage.Sets/src/mage/cards/b/BondsOfFaith.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; @@ -48,6 +47,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/b/BondsOfMortality.java b/Mage.Sets/src/mage/cards/b/BondsOfMortality.java index c08f5acaef3..11ab8500e93 100644 --- a/Mage.Sets/src/mage/cards/b/BondsOfMortality.java +++ b/Mage.Sets/src/mage/cards/b/BondsOfMortality.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java b/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java index 77b42977781..63345177a5a 100644 --- a/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java +++ b/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -39,11 +36,14 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/b/BoneDancer.java b/Mage.Sets/src/mage/cards/b/BoneDancer.java index 833d24b4958..e0385499b63 100644 --- a/Mage.Sets/src/mage/cards/b/BoneDancer.java +++ b/Mage.Sets/src/mage/cards/b/BoneDancer.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BoneFlute.java b/Mage.Sets/src/mage/cards/b/BoneFlute.java index 5c8a42f9b51..cd113f311de 100644 --- a/Mage.Sets/src/mage/cards/b/BoneFlute.java +++ b/Mage.Sets/src/mage/cards/b/BoneFlute.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BoneHarvest.java b/Mage.Sets/src/mage/cards/b/BoneHarvest.java index be8211fcdd5..de5a0d688f9 100644 --- a/Mage.Sets/src/mage/cards/b/BoneHarvest.java +++ b/Mage.Sets/src/mage/cards/b/BoneHarvest.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BoneSaw.java b/Mage.Sets/src/mage/cards/b/BoneSaw.java index 15b650f088f..f0b5d3773c1 100644 --- a/Mage.Sets/src/mage/cards/b/BoneSaw.java +++ b/Mage.Sets/src/mage/cards/b/BoneSaw.java @@ -28,16 +28,17 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; 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.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BoneShredder.java b/Mage.Sets/src/mage/cards/b/BoneShredder.java index 9aed0f9d7fc..53ffe4fcee7 100644 --- a/Mage.Sets/src/mage/cards/b/BoneShredder.java +++ b/Mage.Sets/src/mage/cards/b/BoneShredder.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,6 +36,7 @@ import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BoneSplinters.java b/Mage.Sets/src/mage/cards/b/BoneSplinters.java index 4ce0bab55f3..c0739a81f90 100644 --- a/Mage.Sets/src/mage/cards/b/BoneSplinters.java +++ b/Mage.Sets/src/mage/cards/b/BoneSplinters.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BoneToAsh.java b/Mage.Sets/src/mage/cards/b/BoneToAsh.java index 0d0418a1457..ccae035e972 100644 --- a/Mage.Sets/src/mage/cards/b/BoneToAsh.java +++ b/Mage.Sets/src/mage/cards/b/BoneToAsh.java @@ -27,16 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BonebreakerGiant.java b/Mage.Sets/src/mage/cards/b/BonebreakerGiant.java index 8453be94df4..c5939dc7bf8 100644 --- a/Mage.Sets/src/mage/cards/b/BonebreakerGiant.java +++ b/Mage.Sets/src/mage/cards/b/BonebreakerGiant.java @@ -28,12 +28,12 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Bonehoard.java b/Mage.Sets/src/mage/cards/b/Bonehoard.java index 2c3ba5a632c..0c6e4466118 100644 --- a/Mage.Sets/src/mage/cards/b/Bonehoard.java +++ b/Mage.Sets/src/mage/cards/b/Bonehoard.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; @@ -39,8 +35,13 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.LivingWeaponAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/Boneknitter.java b/Mage.Sets/src/mage/cards/b/Boneknitter.java index 6dbde7a4ed4..7762e53fb32 100644 --- a/Mage.Sets/src/mage/cards/b/Boneknitter.java +++ b/Mage.Sets/src/mage/cards/b/Boneknitter.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BonescytheSliver.java b/Mage.Sets/src/mage/cards/b/BonescytheSliver.java index 0b094aebe73..587722b8d64 100644 --- a/Mage.Sets/src/mage/cards/b/BonescytheSliver.java +++ b/Mage.Sets/src/mage/cards/b/BonescytheSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java b/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java index 8cc22b7a7b6..16679911e9e 100644 --- a/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java +++ b/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTargetTriggeredAbility; @@ -46,6 +45,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/Bonesplitter.java b/Mage.Sets/src/mage/cards/b/Bonesplitter.java index 373d6d67c8d..312257c22ea 100644 --- a/Mage.Sets/src/mage/cards/b/Bonesplitter.java +++ b/Mage.Sets/src/mage/cards/b/Bonesplitter.java @@ -27,18 +27,18 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; 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.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java b/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java index b6348ad778c..9f9dc15b272 100644 --- a/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java +++ b/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author Sir-Speshkitty diff --git a/Mage.Sets/src/mage/cards/b/BoneyardWurm.java b/Mage.Sets/src/mage/cards/b/BoneyardWurm.java index 42ffe58b00e..089317427f9 100644 --- a/Mage.Sets/src/mage/cards/b/BoneyardWurm.java +++ b/Mage.Sets/src/mage/cards/b/BoneyardWurm.java @@ -27,15 +27,15 @@ */ package mage.cards.b; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BonfireOfTheDamned.java b/Mage.Sets/src/mage/cards/b/BonfireOfTheDamned.java index 27adc407b2a..b472393c0b7 100644 --- a/Mage.Sets/src/mage/cards/b/BonfireOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/b/BonfireOfTheDamned.java @@ -27,13 +27,13 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.MiracleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/b/BookBurning.java b/Mage.Sets/src/mage/cards/b/BookBurning.java index 21182c8a428..1f703346cb6 100644 --- a/Mage.Sets/src/mage/cards/b/BookBurning.java +++ b/Mage.Sets/src/mage/cards/b/BookBurning.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author tomd1990 diff --git a/Mage.Sets/src/mage/cards/b/BookOfRass.java b/Mage.Sets/src/mage/cards/b/BookOfRass.java index ec2190ee4e3..11031353ef5 100644 --- a/Mage.Sets/src/mage/cards/b/BookOfRass.java +++ b/Mage.Sets/src/mage/cards/b/BookOfRass.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; @@ -39,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/b/BoomBust.java b/Mage.Sets/src/mage/cards/b/BoomBust.java index af2f68c27c1..d34e28e3563 100644 --- a/Mage.Sets/src/mage/cards/b/BoomBust.java +++ b/Mage.Sets/src/mage/cards/b/BoomBust.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + public class BoomBust extends SplitCard { private static final FilterLandPermanent filter1 = new FilterLandPermanent("land you control"); diff --git a/Mage.Sets/src/mage/cards/b/Boomerang.java b/Mage.Sets/src/mage/cards/b/Boomerang.java index e3404c9c038..d92ebe3cf54 100644 --- a/Mage.Sets/src/mage/cards/b/Boomerang.java +++ b/Mage.Sets/src/mage/cards/b/Boomerang.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Boompile.java b/Mage.Sets/src/mage/cards/b/Boompile.java index 7b418d055bd..c2f33b150de 100644 --- a/Mage.Sets/src/mage/cards/b/Boompile.java +++ b/Mage.Sets/src/mage/cards/b/Boompile.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DestroyAllEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java b/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java index c8eeee1936d..1724a92cfd9 100644 --- a/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java +++ b/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/b/BoonOfErebos.java b/Mage.Sets/src/mage/cards/b/BoonOfErebos.java index 328b29cb012..d89d62f8f00 100644 --- a/Mage.Sets/src/mage/cards/b/BoonOfErebos.java +++ b/Mage.Sets/src/mage/cards/b/BoonOfErebos.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.RegenerateTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoonReflection.java b/Mage.Sets/src/mage/cards/b/BoonReflection.java index 6d17eb2bdcc..84ec58ff2bd 100644 --- a/Mage.Sets/src/mage/cards/b/BoonReflection.java +++ b/Mage.Sets/src/mage/cards/b/BoonReflection.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BoonSatyr.java b/Mage.Sets/src/mage/cards/b/BoonSatyr.java index 8d0f5368674..2097405ce87 100644 --- a/Mage.Sets/src/mage/cards/b/BoonSatyr.java +++ b/Mage.Sets/src/mage/cards/b/BoonSatyr.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoonweaverGiant.java b/Mage.Sets/src/mage/cards/b/BoonweaverGiant.java index c4265768fde..b45ec16ef23 100644 --- a/Mage.Sets/src/mage/cards/b/BoonweaverGiant.java +++ b/Mage.Sets/src/mage/cards/b/BoonweaverGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -48,6 +47,8 @@ import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Borborygmos.java b/Mage.Sets/src/mage/cards/b/Borborygmos.java index 09f611be489..7a7ac457397 100644 --- a/Mage.Sets/src/mage/cards/b/Borborygmos.java +++ b/Mage.Sets/src/mage/cards/b/Borborygmos.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; @@ -35,9 +34,12 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -46,7 +48,7 @@ public class Borborygmos extends CardImpl { public Borborygmos(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cyclops"); this.power = new MageInt(6); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java b/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java index c4ebfeedbce..dbb282560eb 100644 --- a/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java +++ b/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,11 +37,15 @@ import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman @@ -55,7 +56,7 @@ public class BorborygmosEnraged extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}{G}{G}"); this.subtype.add("Cyclops"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/b/BorderGuard.java b/Mage.Sets/src/mage/cards/b/BorderGuard.java index c93701d49fa..dd40ae0e2dc 100644 --- a/Mage.Sets/src/mage/cards/b/BorderGuard.java +++ b/Mage.Sets/src/mage/cards/b/BorderGuard.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BorderPatrol.java b/Mage.Sets/src/mage/cards/b/BorderPatrol.java index ad3f054113d..640eeb96cbc 100644 --- a/Mage.Sets/src/mage/cards/b/BorderPatrol.java +++ b/Mage.Sets/src/mage/cards/b/BorderPatrol.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java b/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java index 7cd2880b0b7..bf8476f5bea 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java b/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java index 5d7eee81fe6..c888f614d72 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java @@ -27,17 +27,11 @@ */ package mage.cards.b; -import java.util.HashMap; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterCard; @@ -48,6 +42,9 @@ import mage.target.Target; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetDiscard; +import java.util.HashMap; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BorderlandMarauder.java b/Mage.Sets/src/mage/cards/b/BorderlandMarauder.java index cf02f380240..8153e2c647f 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandMarauder.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandMarauder.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BorderlandMinotaur.java b/Mage.Sets/src/mage/cards/b/BorderlandMinotaur.java index b344be40cf3..947c44866b7 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandMinotaur.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandMinotaur.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BorderlandRanger.java b/Mage.Sets/src/mage/cards/b/BorderlandRanger.java index 30f9f132936..87605baef80 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandRanger.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandRanger.java @@ -27,16 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BorealCentaur.java b/Mage.Sets/src/mage/cards/b/BorealCentaur.java index 5b00f169b45..e5fe2af2203 100644 --- a/Mage.Sets/src/mage/cards/b/BorealCentaur.java +++ b/Mage.Sets/src/mage/cards/b/BorealCentaur.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,8 +35,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox @@ -46,7 +48,7 @@ public class BorealCentaur extends CardImpl { public BorealCentaur(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Centaur"); this.subtype.add("Warrior"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/BorealDruid.java b/Mage.Sets/src/mage/cards/b/BorealDruid.java index 253b92118f4..d822a8a5c2a 100644 --- a/Mage.Sets/src/mage/cards/b/BorealDruid.java +++ b/Mage.Sets/src/mage/cards/b/BorealDruid.java @@ -27,12 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class BorealDruid extends CardImpl { public BorealDruid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Elf"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/cards/b/BorealGriffin.java b/Mage.Sets/src/mage/cards/b/BorealGriffin.java index 333c4beed94..9db5882ca05 100644 --- a/Mage.Sets/src/mage/cards/b/BorealGriffin.java +++ b/Mage.Sets/src/mage/cards/b/BorealGriffin.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,8 +37,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox @@ -48,7 +50,7 @@ public class BorealGriffin extends CardImpl { public BorealGriffin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Griffin"); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/BorealShelf.java b/Mage.Sets/src/mage/cards/b/BorealShelf.java index b6bcd2cf498..262daaf670c 100644 --- a/Mage.Sets/src/mage/cards/b/BorealShelf.java +++ b/Mage.Sets/src/mage/cards/b/BorealShelf.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +45,7 @@ public class BorealShelf extends CardImpl { public BorealShelf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); // Boreal Shelf enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/b/BorisDevilboon.java b/Mage.Sets/src/mage/cards/b/BorisDevilboon.java index f319e61bf3b..9fdfab72a25 100644 --- a/Mage.Sets/src/mage/cards/b/BorisDevilboon.java +++ b/Mage.Sets/src/mage/cards/b/BorisDevilboon.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +36,12 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LoneFox @@ -48,7 +50,7 @@ public class BorisDevilboon extends CardImpl { public BorisDevilboon(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Wizard"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/BorosBattleshaper.java b/Mage.Sets/src/mage/cards/b/BorosBattleshaper.java index 030eb88cf8d..d7047644d01 100644 --- a/Mage.Sets/src/mage/cards/b/BorosBattleshaper.java +++ b/Mage.Sets/src/mage/cards/b/BorosBattleshaper.java @@ -28,12 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -48,13 +42,15 @@ import mage.abilities.keyword.AttacksThisTurnMarkerAbility; import mage.abilities.keyword.BlocksThisTurnMarkerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BorosCharm.java b/Mage.Sets/src/mage/cards/b/BorosCharm.java index b421f3af2c7..e357544505c 100644 --- a/Mage.Sets/src/mage/cards/b/BorosCharm.java +++ b/Mage.Sets/src/mage/cards/b/BorosCharm.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -39,11 +36,14 @@ import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BorosCluestone.java b/Mage.Sets/src/mage/cards/b/BorosCluestone.java index 372008d36bf..32b8f4408d7 100644 --- a/Mage.Sets/src/mage/cards/b/BorosCluestone.java +++ b/Mage.Sets/src/mage/cards/b/BorosCluestone.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +38,10 @@ import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BorosElite.java b/Mage.Sets/src/mage/cards/b/BorosElite.java index 5b7579478f3..a846825f7f4 100644 --- a/Mage.Sets/src/mage/cards/b/BorosElite.java +++ b/Mage.Sets/src/mage/cards/b/BorosElite.java @@ -27,16 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.BattalionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BorosGarrison.java b/Mage.Sets/src/mage/cards/b/BorosGarrison.java index b517519ed40..f8ae95fa1b9 100644 --- a/Mage.Sets/src/mage/cards/b/BorosGarrison.java +++ b/Mage.Sets/src/mage/cards/b/BorosGarrison.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/b/BorosGuildgate.java b/Mage.Sets/src/mage/cards/b/BorosGuildgate.java index 12423f75305..2768e0fe61c 100644 --- a/Mage.Sets/src/mage/cards/b/BorosGuildgate.java +++ b/Mage.Sets/src/mage/cards/b/BorosGuildgate.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BorosGuildmage.java b/Mage.Sets/src/mage/cards/b/BorosGuildmage.java index 44cb5f8ffa5..a3bb07dbd60 100644 --- a/Mage.Sets/src/mage/cards/b/BorosGuildmage.java +++ b/Mage.Sets/src/mage/cards/b/BorosGuildmage.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +37,13 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BorosMastiff.java b/Mage.Sets/src/mage/cards/b/BorosMastiff.java index 6b370b2bf09..a8d6d7e355b 100644 --- a/Mage.Sets/src/mage/cards/b/BorosMastiff.java +++ b/Mage.Sets/src/mage/cards/b/BorosMastiff.java @@ -28,15 +28,16 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.BattalionAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BorosReckoner.java b/Mage.Sets/src/mage/cards/b/BorosReckoner.java index 1d61280cf87..3e0f2d4156d 100644 --- a/Mage.Sets/src/mage/cards/b/BorosReckoner.java +++ b/Mage.Sets/src/mage/cards/b/BorosReckoner.java @@ -27,11 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; @@ -42,11 +37,17 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BorosRecruit.java b/Mage.Sets/src/mage/cards/b/BorosRecruit.java index 45457cbb746..58ace908a8e 100644 --- a/Mage.Sets/src/mage/cards/b/BorosRecruit.java +++ b/Mage.Sets/src/mage/cards/b/BorosRecruit.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BorosSignet.java b/Mage.Sets/src/mage/cards/b/BorosSignet.java index e61f658a2f6..9c64d88cc82 100644 --- a/Mage.Sets/src/mage/cards/b/BorosSignet.java +++ b/Mage.Sets/src/mage/cards/b/BorosSignet.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +35,10 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BorosSwiftblade.java b/Mage.Sets/src/mage/cards/b/BorosSwiftblade.java index bc1d22f99cd..005424359e3 100644 --- a/Mage.Sets/src/mage/cards/b/BorosSwiftblade.java +++ b/Mage.Sets/src/mage/cards/b/BorosSwiftblade.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BorrowedGrace.java b/Mage.Sets/src/mage/cards/b/BorrowedGrace.java index b4df378b401..519c4ea038f 100644 --- a/Mage.Sets/src/mage/cards/b/BorrowedGrace.java +++ b/Mage.Sets/src/mage/cards/b/BorrowedGrace.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BorrowedHostility.java b/Mage.Sets/src/mage/cards/b/BorrowedHostility.java index 235ddc6b31d..221a2e33e4a 100644 --- a/Mage.Sets/src/mage/cards/b/BorrowedHostility.java +++ b/Mage.Sets/src/mage/cards/b/BorrowedHostility.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BorrowedMalevolence.java b/Mage.Sets/src/mage/cards/b/BorrowedMalevolence.java index cc7fc412d41..dd472787720 100644 --- a/Mage.Sets/src/mage/cards/b/BorrowedMalevolence.java +++ b/Mage.Sets/src/mage/cards/b/BorrowedMalevolence.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java b/Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java index bcf374841e8..85e6037dde6 100644 --- a/Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java +++ b/Mage.Sets/src/mage/cards/b/Borrowing100000Arrows.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BorrowingTheEastWind.java b/Mage.Sets/src/mage/cards/b/BorrowingTheEastWind.java index 46a9d9c3a70..d280cee2ad8 100644 --- a/Mage.Sets/src/mage/cards/b/BorrowingTheEastWind.java +++ b/Mage.Sets/src/mage/cards/b/BorrowingTheEastWind.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.keyword.HorsemanshipAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BoseijuWhoSheltersAll.java b/Mage.Sets/src/mage/cards/b/BoseijuWhoSheltersAll.java index 16048507631..bd2b9c499ba 100644 --- a/Mage.Sets/src/mage/cards/b/BoseijuWhoSheltersAll.java +++ b/Mage.Sets/src/mage/cards/b/BoseijuWhoSheltersAll.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageObject; import mage.Mana; import mage.abilities.Ability; @@ -41,11 +38,7 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; import mage.game.Game; @@ -53,6 +46,10 @@ import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.watchers.Watcher; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 @@ -61,7 +58,7 @@ public class BoseijuWhoSheltersAll extends CardImpl { public BoseijuWhoSheltersAll(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); // Boseiju, Who Shelters All enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java index de81e57ee4a..449d2d9f9a1 100644 --- a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java +++ b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,11 +39,14 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -54,7 +55,7 @@ public class BoshIronGolem extends CardImpl { public BoshIronGolem(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{8}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Golem"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/b/BoskBanneret.java b/Mage.Sets/src/mage/cards/b/BoskBanneret.java index b4d4ded3c10..ac42feadd1c 100644 --- a/Mage.Sets/src/mage/cards/b/BoskBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BoskBanneret.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/Bossk.java b/Mage.Sets/src/mage/cards/b/Bossk.java index 9b62092777d..5746debedf9 100644 --- a/Mage.Sets/src/mage/cards/b/Bossk.java +++ b/Mage.Sets/src/mage/cards/b/Bossk.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -37,6 +36,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterBasicLandCard; @@ -47,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetOpponentsCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -55,7 +57,7 @@ public class Bossk extends CardImpl { public Bossk(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Trandoshan"); this.subtype.add("Hunter"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/b/BotanicalSanctum.java b/Mage.Sets/src/mage/cards/b/BotanicalSanctum.java index b322d71c6bc..0c7e97986cc 100644 --- a/Mage.Sets/src/mage/cards/b/BotanicalSanctum.java +++ b/Mage.Sets/src/mage/cards/b/BotanicalSanctum.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -43,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BottleGnomes.java b/Mage.Sets/src/mage/cards/b/BottleGnomes.java index 759e3e11360..4a4c530b549 100644 --- a/Mage.Sets/src/mage/cards/b/BottleGnomes.java +++ b/Mage.Sets/src/mage/cards/b/BottleGnomes.java @@ -27,17 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java b/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java index c379949865e..a702d139472 100644 --- a/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java +++ b/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java @@ -27,8 +27,7 @@ */ package mage.cards.b; -import java.util.UUID; - +import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -43,7 +42,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; -import mage.MageInt; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BottledCloister.java b/Mage.Sets/src/mage/cards/b/BottledCloister.java index 7b133224297..1bab7e9a8d3 100644 --- a/Mage.Sets/src/mage/cards/b/BottledCloister.java +++ b/Mage.Sets/src/mage/cards/b/BottledCloister.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BottomlessPit.java b/Mage.Sets/src/mage/cards/b/BottomlessPit.java index ec8ac2e1b10..f2741fa123f 100644 --- a/Mage.Sets/src/mage/cards/b/BottomlessPit.java +++ b/Mage.Sets/src/mage/cards/b/BottomlessPit.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; @@ -36,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/b/BottomlessVault.java b/Mage.Sets/src/mage/cards/b/BottomlessVault.java index e04d74b3a75..97cd9ecf2aa 100644 --- a/Mage.Sets/src/mage/cards/b/BottomlessVault.java +++ b/Mage.Sets/src/mage/cards/b/BottomlessVault.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -50,6 +49,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/b/BoulderSalvo.java b/Mage.Sets/src/mage/cards/b/BoulderSalvo.java index 03197d52f32..d1f3e93d465 100644 --- a/Mage.Sets/src/mage/cards/b/BoulderSalvo.java +++ b/Mage.Sets/src/mage/cards/b/BoulderSalvo.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.SurgeAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/Boulderfall.java b/Mage.Sets/src/mage/cards/b/Boulderfall.java index 6811d577e24..571f417f622 100644 --- a/Mage.Sets/src/mage/cards/b/Boulderfall.java +++ b/Mage.Sets/src/mage/cards/b/Boulderfall.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BouncingBeebles.java b/Mage.Sets/src/mage/cards/b/BouncingBeebles.java index 1f80504e22c..1251322dc03 100644 --- a/Mage.Sets/src/mage/cards/b/BouncingBeebles.java +++ b/Mage.Sets/src/mage/cards/b/BouncingBeebles.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DefendingPlayerControlsCondition; @@ -39,8 +35,12 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java index ee28f5a5c88..945980ffb0c 100644 --- a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java +++ b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author halljared diff --git a/Mage.Sets/src/mage/cards/b/BoundDetermined.java b/Mage.Sets/src/mage/cards/b/BoundDetermined.java index 37307ac9b0f..10964581fec 100644 --- a/Mage.Sets/src/mage/cards/b/BoundDetermined.java +++ b/Mage.Sets/src/mage/cards/b/BoundDetermined.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -35,8 +34,8 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ExileSourceEffect; -import mage.cards.CardsImpl; import mage.cards.CardSetInfo; +import mage.cards.CardsImpl; import mage.cards.SplitCard; import mage.constants.CardType; import mage.constants.Duration; @@ -54,6 +53,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoundInSilence.java b/Mage.Sets/src/mage/cards/b/BoundInSilence.java index aace82c01ad..f8a4e248746 100644 --- a/Mage.Sets/src/mage/cards/b/BoundInSilence.java +++ b/Mage.Sets/src/mage/cards/b/BoundInSilence.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,9 +34,15 @@ import mage.abilities.effects.common.combat.CantAttackBlockAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BoundingKrasis.java b/Mage.Sets/src/mage/cards/b/BoundingKrasis.java index d3c10004c78..b727674dc8c 100644 --- a/Mage.Sets/src/mage/cards/b/BoundingKrasis.java +++ b/Mage.Sets/src/mage/cards/b/BoundingKrasis.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BoundlessRealms.java b/Mage.Sets/src/mage/cards/b/BoundlessRealms.java index 8edb2bfa554..aabda636a62 100644 --- a/Mage.Sets/src/mage/cards/b/BoundlessRealms.java +++ b/Mage.Sets/src/mage/cards/b/BoundlessRealms.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.OneShotEffect; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BounteousKirin.java b/Mage.Sets/src/mage/cards/b/BounteousKirin.java index 756b4c3ffc1..139f2eb5bc5 100644 --- a/Mage.Sets/src/mage/cards/b/BounteousKirin.java +++ b/Mage.Sets/src/mage/cards/b/BounteousKirin.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -37,12 +36,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -51,7 +53,7 @@ public class BounteousKirin extends CardImpl { public BounteousKirin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kirin"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/b/BountifulHarvest.java b/Mage.Sets/src/mage/cards/b/BountifulHarvest.java index a12c920163b..7082845615d 100644 --- a/Mage.Sets/src/mage/cards/b/BountifulHarvest.java +++ b/Mage.Sets/src/mage/cards/b/BountifulHarvest.java @@ -28,15 +28,16 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BountyCollector.java b/Mage.Sets/src/mage/cards/b/BountyCollector.java index af42d1e6409..3e6edaa06cf 100644 --- a/Mage.Sets/src/mage/cards/b/BountyCollector.java +++ b/Mage.Sets/src/mage/cards/b/BountyCollector.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BountyHunter.java b/Mage.Sets/src/mage/cards/b/BountyHunter.java index a8113cfc3ad..ac879d37556 100644 --- a/Mage.Sets/src/mage/cards/b/BountyHunter.java +++ b/Mage.Sets/src/mage/cards/b/BountyHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BountyOfTheHunt.java b/Mage.Sets/src/mage/cards/b/BountyOfTheHunt.java index f7689d4557e..216b66a4b8c 100644 --- a/Mage.Sets/src/mage/cards/b/BountyOfTheHunt.java +++ b/Mage.Sets/src/mage/cards/b/BountyOfTheHunt.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BountySniper.java b/Mage.Sets/src/mage/cards/b/BountySniper.java index a383cb0024c..e7d95bd0cc8 100644 --- a/Mage.Sets/src/mage/cards/b/BountySniper.java +++ b/Mage.Sets/src/mage/cards/b/BountySniper.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BountySpotter.java b/Mage.Sets/src/mage/cards/b/BountySpotter.java index 0208ef26f81..f9aa5065168 100644 --- a/Mage.Sets/src/mage/cards/b/BountySpotter.java +++ b/Mage.Sets/src/mage/cards/b/BountySpotter.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetOpponentsCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BowOfNylea.java b/Mage.Sets/src/mage/cards/b/BowOfNylea.java index b4481eb7850..8dcb21d3286 100644 --- a/Mage.Sets/src/mage/cards/b/BowOfNylea.java +++ b/Mage.Sets/src/mage/cards/b/BowOfNylea.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleActivatedAbility; @@ -41,15 +40,8 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterAttackingCreature; @@ -61,6 +53,8 @@ import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -74,7 +68,7 @@ public class BowOfNylea extends CardImpl { public BowOfNylea(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.ARTIFACT},"{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Attacking creatures you control have deathtouch. diff --git a/Mage.Sets/src/mage/cards/b/BowerPassage.java b/Mage.Sets/src/mage/cards/b/BowerPassage.java index e35cc35bd2c..e1b4a2d2421 100644 --- a/Mage.Sets/src/mage/cards/b/BowerPassage.java +++ b/Mage.Sets/src/mage/cards/b/BowerPassage.java @@ -27,13 +27,13 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/b/BrackwaterElemental.java b/Mage.Sets/src/mage/cards/b/BrackwaterElemental.java index d24c91a12b1..4f6b1b4a979 100644 --- a/Mage.Sets/src/mage/cards/b/BrackwaterElemental.java +++ b/Mage.Sets/src/mage/cards/b/BrackwaterElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BragoKingEternal.java b/Mage.Sets/src/mage/cards/b/BragoKingEternal.java index 0c2b328361f..790279a79a7 100644 --- a/Mage.Sets/src/mage/cards/b/BragoKingEternal.java +++ b/Mage.Sets/src/mage/cards/b/BragoKingEternal.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -38,12 +37,15 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +54,7 @@ public class BragoKingEternal extends CardImpl { public BragoKingEternal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/BraidOfFire.java b/Mage.Sets/src/mage/cards/b/BraidOfFire.java index a2d5142684b..b0887d9c857 100644 --- a/Mage.Sets/src/mage/cards/b/BraidOfFire.java +++ b/Mage.Sets/src/mage/cards/b/BraidOfFire.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author AlumiuN diff --git a/Mage.Sets/src/mage/cards/b/BraidsCabalMinion.java b/Mage.Sets/src/mage/cards/b/BraidsCabalMinion.java index 7aa9e9c0565..c500d7c571c 100644 --- a/Mage.Sets/src/mage/cards/b/BraidsCabalMinion.java +++ b/Mage.Sets/src/mage/cards/b/BraidsCabalMinion.java @@ -27,19 +27,21 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author cbt33, North (Karma) @@ -56,7 +58,7 @@ public class BraidsCabalMinion extends CardImpl { public BraidsCabalMinion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Minion"); diff --git a/Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java b/Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java index f736f9ca992..1a7d66fd501 100644 --- a/Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java +++ b/Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java @@ -27,18 +27,20 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LoneFox @@ -56,7 +58,7 @@ public class BraidsConjurerAdept extends CardImpl { public BraidsConjurerAdept(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/BraidwoodCup.java b/Mage.Sets/src/mage/cards/b/BraidwoodCup.java index d9fe67705cc..43bbe137745 100644 --- a/Mage.Sets/src/mage/cards/b/BraidwoodCup.java +++ b/Mage.Sets/src/mage/cards/b/BraidwoodCup.java @@ -27,17 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java b/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java index dccfb31038e..bbf15ffc88e 100644 --- a/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java +++ b/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BrainFreeze.java b/Mage.Sets/src/mage/cards/b/BrainFreeze.java index 7b07ec7235c..0046d0d628c 100644 --- a/Mage.Sets/src/mage/cards/b/BrainFreeze.java +++ b/Mage.Sets/src/mage/cards/b/BrainFreeze.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BrainGorgers.java b/Mage.Sets/src/mage/cards/b/BrainGorgers.java index 3edc1039285..1c751ef54ac 100644 --- a/Mage.Sets/src/mage/cards/b/BrainGorgers.java +++ b/Mage.Sets/src/mage/cards/b/BrainGorgers.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -45,6 +44,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrainInAJar.java b/Mage.Sets/src/mage/cards/b/BrainInAJar.java index c539edc0925..1f5ea7af5e5 100644 --- a/Mage.Sets/src/mage/cards/b/BrainInAJar.java +++ b/Mage.Sets/src/mage/cards/b/BrainInAJar.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; @@ -52,6 +51,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrainMaggot.java b/Mage.Sets/src/mage/cards/b/BrainMaggot.java index 26ff8d1b750..bd08753084a 100644 --- a/Mage.Sets/src/mage/cards/b/BrainMaggot.java +++ b/Mage.Sets/src/mage/cards/b/BrainMaggot.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -54,6 +53,8 @@ import mage.target.TargetCard; import mage.target.common.TargetOpponent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrainPry.java b/Mage.Sets/src/mage/cards/b/BrainPry.java index fe92f3c9a99..dcae66062c6 100644 --- a/Mage.Sets/src/mage/cards/b/BrainPry.java +++ b/Mage.Sets/src/mage/cards/b/BrainPry.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BrainWeevil.java b/Mage.Sets/src/mage/cards/b/BrainWeevil.java index 99517b1392c..aaf646de250 100644 --- a/Mage.Sets/src/mage/cards/b/BrainWeevil.java +++ b/Mage.Sets/src/mage/cards/b/BrainWeevil.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Brainbite.java b/Mage.Sets/src/mage/cards/b/Brainbite.java index e9e04a740e3..1f86c4b66df 100644 --- a/Mage.Sets/src/mage/cards/b/Brainbite.java +++ b/Mage.Sets/src/mage/cards/b/Brainbite.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Braingeyser.java b/Mage.Sets/src/mage/cards/b/Braingeyser.java index eb6649d95e8..7ec60325fa5 100644 --- a/Mage.Sets/src/mage/cards/b/Braingeyser.java +++ b/Mage.Sets/src/mage/cards/b/Braingeyser.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/b/Brainspoil.java b/Mage.Sets/src/mage/cards/b/Brainspoil.java index f432d4d1f7a..986f3358ebb 100644 --- a/Mage.Sets/src/mage/cards/b/Brainspoil.java +++ b/Mage.Sets/src/mage/cards/b/Brainspoil.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/Brainstorm.java b/Mage.Sets/src/mage/cards/b/Brainstorm.java index 3b2d714f69b..a28d53ce3e9 100644 --- a/Mage.Sets/src/mage/cards/b/Brainstorm.java +++ b/Mage.Sets/src/mage/cards/b/Brainstorm.java @@ -27,13 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.effects.common.BrainstormEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/b/Brainwash.java b/Mage.Sets/src/mage/cards/b/Brainwash.java index c90e0e887bf..1032d464d56 100644 --- a/Mage.Sets/src/mage/cards/b/Brainwash.java +++ b/Mage.Sets/src/mage/cards/b/Brainwash.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/b/BrambleCreeper.java b/Mage.Sets/src/mage/cards/b/BrambleCreeper.java index 90d22e7dce4..32ad636222c 100644 --- a/Mage.Sets/src/mage/cards/b/BrambleCreeper.java +++ b/Mage.Sets/src/mage/cards/b/BrambleCreeper.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BrambleElemental.java b/Mage.Sets/src/mage/cards/b/BrambleElemental.java index 514507be7c7..14de3eb1721 100644 --- a/Mage.Sets/src/mage/cards/b/BrambleElemental.java +++ b/Mage.Sets/src/mage/cards/b/BrambleElemental.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AuraAttachedTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SaprolingToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Bramblecrush.java b/Mage.Sets/src/mage/cards/b/Bramblecrush.java index f890f257f96..6499fa7261c 100644 --- a/Mage.Sets/src/mage/cards/b/Bramblecrush.java +++ b/Mage.Sets/src/mage/cards/b/Bramblecrush.java @@ -27,16 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/Bramblesnap.java b/Mage.Sets/src/mage/cards/b/Bramblesnap.java index e23bd92290a..e782487aa1f 100644 --- a/Mage.Sets/src/mage/cards/b/Bramblesnap.java +++ b/Mage.Sets/src/mage/cards/b/Bramblesnap.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -38,8 +34,13 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BramblewoodParagon.java b/Mage.Sets/src/mage/cards/b/BramblewoodParagon.java index b080bea4fac..cf63da767f8 100644 --- a/Mage.Sets/src/mage/cards/b/BramblewoodParagon.java +++ b/Mage.Sets/src/mage/cards/b/BramblewoodParagon.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BranchingBolt.java b/Mage.Sets/src/mage/cards/b/BranchingBolt.java index 6755253d311..9652b85859a 100644 --- a/Mage.Sets/src/mage/cards/b/BranchingBolt.java +++ b/Mage.Sets/src/mage/cards/b/BranchingBolt.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -37,6 +34,8 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java b/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java index 1e1014ac8c7..32a73c22905 100644 --- a/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java +++ b/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.TrampleAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MorphAbility; +import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/Brand.java b/Mage.Sets/src/mage/cards/b/Brand.java index df16bcd9b3b..a57f74a0add 100644 --- a/Mage.Sets/src/mage/cards/b/Brand.java +++ b/Mage.Sets/src/mage/cards/b/Brand.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.GainControlAllEffect; import mage.abilities.keyword.CyclingAbility; @@ -40,6 +38,8 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.other.OwnerPredicate; +import java.util.UUID; + /** * * @author fenhl diff --git a/Mage.Sets/src/mage/cards/b/BrandedHowler.java b/Mage.Sets/src/mage/cards/b/BrandedHowler.java index 556002ee6f6..f16c5fdf5c9 100644 --- a/Mage.Sets/src/mage/cards/b/BrandedHowler.java +++ b/Mage.Sets/src/mage/cards/b/BrandedHowler.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BrassGnat.java b/Mage.Sets/src/mage/cards/b/BrassGnat.java index 5d93bf8d8fc..bf9f82f5027 100644 --- a/Mage.Sets/src/mage/cards/b/BrassGnat.java +++ b/Mage.Sets/src/mage/cards/b/BrassGnat.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/b/BrassHerald.java b/Mage.Sets/src/mage/cards/b/BrassHerald.java index 3af6b53f7ea..484e0c38819 100644 --- a/Mage.Sets/src/mage/cards/b/BrassHerald.java +++ b/Mage.Sets/src/mage/cards/b/BrassHerald.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -47,6 +46,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ChosenSubtypePredicate; import mage.game.Game; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BrassMan.java b/Mage.Sets/src/mage/cards/b/BrassMan.java index 49edc0c1545..fb91d7c20e6 100644 --- a/Mage.Sets/src/mage/cards/b/BrassMan.java +++ b/Mage.Sets/src/mage/cards/b/BrassMan.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/b/BrassSecretary.java b/Mage.Sets/src/mage/cards/b/BrassSecretary.java index 6165726551a..9ad48f2e032 100644 --- a/Mage.Sets/src/mage/cards/b/BrassSecretary.java +++ b/Mage.Sets/src/mage/cards/b/BrassSecretary.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,8 +35,11 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BrassSquire.java b/Mage.Sets/src/mage/cards/b/BrassSquire.java index d679a30f843..5350d17c7d3 100644 --- a/Mage.Sets/src/mage/cards/b/BrassSquire.java +++ b/Mage.Sets/src/mage/cards/b/BrassSquire.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +34,9 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java b/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java index 9a0b68146d4..3be73debe8a 100644 --- a/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java +++ b/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBlockCreaturesSourceEffect; @@ -39,6 +38,8 @@ import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/b/Bravado.java b/Mage.Sets/src/mage/cards/b/Bravado.java index 2210c335c8f..9655ddccb62 100644 --- a/Mage.Sets/src/mage/cards/b/Bravado.java +++ b/Mage.Sets/src/mage/cards/b/Bravado.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -37,12 +34,15 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BraveTheElements.java b/Mage.Sets/src/mage/cards/b/BraveTheElements.java index f08e5ff9b03..5b6551faf41 100644 --- a/Mage.Sets/src/mage/cards/b/BraveTheElements.java +++ b/Mage.Sets/src/mage/cards/b/BraveTheElements.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.continuous.GainProtectionFromColorAllEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BraveTheSands.java b/Mage.Sets/src/mage/cards/b/BraveTheSands.java index 44cd2ae2b79..847a3c46aab 100644 --- a/Mage.Sets/src/mage/cards/b/BraveTheSands.java +++ b/Mage.Sets/src/mage/cards/b/BraveTheSands.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureAllEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BrawlersPlate.java b/Mage.Sets/src/mage/cards/b/BrawlersPlate.java index 53160388b28..629a393ec50 100644 --- a/Mage.Sets/src/mage/cards/b/BrawlersPlate.java +++ b/Mage.Sets/src/mage/cards/b/BrawlersPlate.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/Brawn.java b/Mage.Sets/src/mage/cards/b/Brawn.java index a01bfa915ec..9372e0db319 100644 --- a/Mage.Sets/src/mage/cards/b/Brawn.java +++ b/Mage.Sets/src/mage/cards/b/Brawn.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -38,6 +36,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BrazenScourge.java b/Mage.Sets/src/mage/cards/b/BrazenScourge.java index cd3d569ddc6..5bf4ba203c4 100644 --- a/Mage.Sets/src/mage/cards/b/BrazenScourge.java +++ b/Mage.Sets/src/mage/cards/b/BrazenScourge.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BrazenWolves.java b/Mage.Sets/src/mage/cards/b/BrazenWolves.java index 6e550cf0d3b..684dd6ef4bf 100644 --- a/Mage.Sets/src/mage/cards/b/BrazenWolves.java +++ b/Mage.Sets/src/mage/cards/b/BrazenWolves.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Breach.java b/Mage.Sets/src/mage/cards/b/Breach.java index 3f6a49478d4..8875c53b407 100644 --- a/Mage.Sets/src/mage/cards/b/Breach.java +++ b/Mage.Sets/src/mage/cards/b/Breach.java @@ -27,17 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java b/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java index da5cea6ecd3..fd61293142e 100644 --- a/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java +++ b/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BreachingLeviathan.java b/Mage.Sets/src/mage/cards/b/BreachingLeviathan.java index 283213340b1..5325edbd388 100644 --- a/Mage.Sets/src/mage/cards/b/BreachingLeviathan.java +++ b/Mage.Sets/src/mage/cards/b/BreachingLeviathan.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -51,6 +48,10 @@ import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTargets; import mage.watchers.common.CastFromHandWatcher; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BreakAsunder.java b/Mage.Sets/src/mage/cards/b/BreakAsunder.java index 11ceffa37ef..2ae34987e7b 100644 --- a/Mage.Sets/src/mage/cards/b/BreakAsunder.java +++ b/Mage.Sets/src/mage/cards/b/BreakAsunder.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; -import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.target.TargetPermanent; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.filter.common.FilterArtifactOrEnchantmentPermanent; +import mage.target.TargetPermanent; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BreakOfDay.java b/Mage.Sets/src/mage/cards/b/BreakOfDay.java index fc8f4611c28..0f03217091b 100644 --- a/Mage.Sets/src/mage/cards/b/BreakOfDay.java +++ b/Mage.Sets/src/mage/cards/b/BreakOfDay.java @@ -27,10 +27,7 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.LockedInCondition; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -38,8 +35,12 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java b/Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java index 7831c8000e8..91bcb4cca45 100644 --- a/Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java +++ b/Mage.Sets/src/mage/cards/b/BreakThroughTheLine.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java b/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java index 87ab083b04e..c6fc31754e3 100644 --- a/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java +++ b/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.MustBeBlockedByAllSourceEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BreakingEntering.java b/Mage.Sets/src/mage/cards/b/BreakingEntering.java index a8584cd023a..5d0e70353e8 100644 --- a/Mage.Sets/src/mage/cards/b/BreakingEntering.java +++ b/Mage.Sets/src/mage/cards/b/BreakingEntering.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -49,6 +48,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetCardInGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + public class BreakingEntering extends SplitCard { public BreakingEntering(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BreakingPoint.java b/Mage.Sets/src/mage/cards/b/BreakingPoint.java index 843c348a197..308bc5019b0 100644 --- a/Mage.Sets/src/mage/cards/b/BreakingPoint.java +++ b/Mage.Sets/src/mage/cards/b/BreakingPoint.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/b/BreakingWave.java b/Mage.Sets/src/mage/cards/b/BreakingWave.java index 0680e8ae953..bcc9a861d63 100644 --- a/Mage.Sets/src/mage/cards/b/BreakingWave.java +++ b/Mage.Sets/src/mage/cards/b/BreakingWave.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.PayMoreToCastAsThoughtItHadFlashAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +40,9 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.List; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BreakneckRider.java b/Mage.Sets/src/mage/cards/b/BreakneckRider.java index 3836d9492de..f8ebccee6ed 100644 --- a/Mage.Sets/src/mage/cards/b/BreakneckRider.java +++ b/Mage.Sets/src/mage/cards/b/BreakneckRider.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -35,12 +34,14 @@ import mage.abilities.condition.common.NoSpellsWereCastLastTurnCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.n.NeckBreaker; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.n.NeckBreaker; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/Breakthrough.java b/Mage.Sets/src/mage/cards/b/Breakthrough.java index f8f2e05451b..2d756f29c00 100644 --- a/Mage.Sets/src/mage/cards/b/Breakthrough.java +++ b/Mage.Sets/src/mage/cards/b/Breakthrough.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BreathOfDarigaaz.java b/Mage.Sets/src/mage/cards/b/BreathOfDarigaaz.java index dd872e0929e..1ebfa467f8f 100644 --- a/Mage.Sets/src/mage/cards/b/BreathOfDarigaaz.java +++ b/Mage.Sets/src/mage/cards/b/BreathOfDarigaaz.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageEverythingEffect; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/b/BreathOfFury.java b/Mage.Sets/src/mage/cards/b/BreathOfFury.java index 74c8da96e24..a5075c21f8e 100644 --- a/Mage.Sets/src/mage/cards/b/BreathOfFury.java +++ b/Mage.Sets/src/mage/cards/b/BreathOfFury.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -52,6 +51,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; + +import java.util.UUID; /** * @author duncant */ diff --git a/Mage.Sets/src/mage/cards/b/BreathOfLife.java b/Mage.Sets/src/mage/cards/b/BreathOfLife.java index 02e0855a287..1aba4d07e5a 100644 --- a/Mage.Sets/src/mage/cards/b/BreathOfLife.java +++ b/Mage.Sets/src/mage/cards/b/BreathOfLife.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/b/BreathOfMalfegor.java b/Mage.Sets/src/mage/cards/b/BreathOfMalfegor.java index 2c47b6c6966..354dc4dc344 100644 --- a/Mage.Sets/src/mage/cards/b/BreathOfMalfegor.java +++ b/Mage.Sets/src/mage/cards/b/BreathOfMalfegor.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamagePlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/Breathstealer.java b/Mage.Sets/src/mage/cards/b/Breathstealer.java index cc0de9546d6..7bf4f372b0d 100644 --- a/Mage.Sets/src/mage/cards/b/Breathstealer.java +++ b/Mage.Sets/src/mage/cards/b/Breathstealer.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BredForTheHunt.java b/Mage.Sets/src/mage/cards/b/BredForTheHunt.java index 5490121f311..9df5bcb0f6a 100644 --- a/Mage.Sets/src/mage/cards/b/BredForTheHunt.java +++ b/Mage.Sets/src/mage/cards/b/BredForTheHunt.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + public class BredForTheHunt extends CardImpl { diff --git a/Mage.Sets/src/mage/cards/b/BreedingPit.java b/Mage.Sets/src/mage/cards/b/BreedingPit.java index 78a23badb70..d8c9a987317 100644 --- a/Mage.Sets/src/mage/cards/b/BreedingPit.java +++ b/Mage.Sets/src/mage/cards/b/BreedingPit.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BreedingPool.java b/Mage.Sets/src/mage/cards/b/BreedingPool.java index fd0cfab3933..8fc6865a972 100644 --- a/Mage.Sets/src/mage/cards/b/BreedingPool.java +++ b/Mage.Sets/src/mage/cards/b/BreedingPool.java @@ -28,8 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -37,6 +35,9 @@ import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Breezekeeper.java b/Mage.Sets/src/mage/cards/b/Breezekeeper.java index 1e99cec92e9..a8bb25e27eb 100644 --- a/Mage.Sets/src/mage/cards/b/Breezekeeper.java +++ b/Mage.Sets/src/mage/cards/b/Breezekeeper.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PhasingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java b/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java index 0d174e03187..b581ca9f34f 100644 --- a/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java +++ b/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -44,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.game.permanent.token.Token; @@ -51,6 +51,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -60,7 +62,7 @@ public class BreyaEtheriumShaper extends CardImpl { public BreyaEtheriumShaper(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{W}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/b/BriarShield.java b/Mage.Sets/src/mage/cards/b/BriarShield.java index 35251bb1861..fc82a5501f9 100644 --- a/Mage.Sets/src/mage/cards/b/BriarShield.java +++ b/Mage.Sets/src/mage/cards/b/BriarShield.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java index 90f844d0b76..02325152c55 100644 --- a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java +++ b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.CountType; @@ -47,6 +46,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java b/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java index 91bb60491dd..cebd9af1535 100644 --- a/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java +++ b/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -46,6 +44,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.watchers.common.PermanentsSacrificedWatcher; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Briarhorn.java b/Mage.Sets/src/mage/cards/b/Briarhorn.java index 32d7e308fd9..ef0c43d0ac8 100644 --- a/Mage.Sets/src/mage/cards/b/Briarhorn.java +++ b/Mage.Sets/src/mage/cards/b/Briarhorn.java @@ -27,19 +27,20 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; -import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.EvokeAbility; +import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BriarknitKami.java b/Mage.Sets/src/mage/cards/b/BriarknitKami.java index 61548d03e55..f896586d8e6 100644 --- a/Mage.Sets/src/mage/cards/b/BriarknitKami.java +++ b/Mage.Sets/src/mage/cards/b/BriarknitKami.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BriarpackAlpha.java b/Mage.Sets/src/mage/cards/b/BriarpackAlpha.java index f80001a9474..9f6eb1a6c22 100644 --- a/Mage.Sets/src/mage/cards/b/BriarpackAlpha.java +++ b/Mage.Sets/src/mage/cards/b/BriarpackAlpha.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BribersPurse.java b/Mage.Sets/src/mage/cards/b/BribersPurse.java index 56ee979ae07..28224f0bd98 100644 --- a/Mage.Sets/src/mage/cards/b/BribersPurse.java +++ b/Mage.Sets/src/mage/cards/b/BribersPurse.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.counters.Counter; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Bribery.java b/Mage.Sets/src/mage/cards/b/Bribery.java index 84b85e511dd..518e9918af5 100644 --- a/Mage.Sets/src/mage/cards/b/Bribery.java +++ b/Mage.Sets/src/mage/cards/b/Bribery.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -42,6 +41,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java b/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java index 8c5dcb5ee01..4781c84dd24 100644 --- a/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java +++ b/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java @@ -27,15 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -49,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.ZombieToken; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/Brightflame.java b/Mage.Sets/src/mage/cards/b/Brightflame.java index 385ca6d6fa5..aa314a06d43 100644 --- a/Mage.Sets/src/mage/cards/b/Brightflame.java +++ b/Mage.Sets/src/mage/cards/b/Brightflame.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Dilnu diff --git a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java index 8008f8a6222..6721f69e8ce 100644 --- a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,10 +34,14 @@ import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.abilities.keyword.ReinforceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java b/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java index df0e562c544..78e631c0b42 100644 --- a/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java +++ b/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DynamicManaEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrigidHeroOfKinsbaile.java b/Mage.Sets/src/mage/cards/b/BrigidHeroOfKinsbaile.java index ef287091193..06fed705781 100644 --- a/Mage.Sets/src/mage/cards/b/BrigidHeroOfKinsbaile.java +++ b/Mage.Sets/src/mage/cards/b/BrigidHeroOfKinsbaile.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.game.Game; @@ -45,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -53,7 +55,7 @@ public class BrigidHeroOfKinsbaile extends CardImpl { public BrigidHeroOfKinsbaile(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kithkin"); this.subtype.add("Archer"); diff --git a/Mage.Sets/src/mage/cards/b/BrilliantHalo.java b/Mage.Sets/src/mage/cards/b/BrilliantHalo.java index aa39aa6bb71..da4f396f209 100644 --- a/Mage.Sets/src/mage/cards/b/BrilliantHalo.java +++ b/Mage.Sets/src/mage/cards/b/BrilliantHalo.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,9 +36,15 @@ 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BrilliantPlan.java b/Mage.Sets/src/mage/cards/b/BrilliantPlan.java index 0c73f589632..5d1a7a73b5c 100644 --- a/Mage.Sets/src/mage/cards/b/BrilliantPlan.java +++ b/Mage.Sets/src/mage/cards/b/BrilliantPlan.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrilliantSpectrum.java b/Mage.Sets/src/mage/cards/b/BrilliantSpectrum.java index 14598aff258..4774c8aaeab 100644 --- a/Mage.Sets/src/mage/cards/b/BrilliantSpectrum.java +++ b/Mage.Sets/src/mage/cards/b/BrilliantSpectrum.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ColorsOfManaSpentToCastCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java b/Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java index 6f892ed356a..dbb904768ba 100644 --- a/Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java +++ b/Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java @@ -27,17 +27,10 @@ */ package mage.cards.b; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -47,6 +40,10 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetOpponent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java b/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java index 8a3d6149b8a..54854a64892 100644 --- a/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java +++ b/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -39,12 +38,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; +import mage.game.permanent.token.CatSoldierCreatureToken; import mage.game.permanent.token.Token; import mage.players.Player; -import mage.game.permanent.token.CatSoldierCreatureToken; + +import java.util.UUID; /** * @@ -54,7 +56,7 @@ public class BrimazKingOfOreskos extends CardImpl { public BrimazKingOfOreskos(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cat"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/b/BrimstoneDragon.java b/Mage.Sets/src/mage/cards/b/BrimstoneDragon.java index b824d695e0d..500bfe9e3ae 100644 --- a/Mage.Sets/src/mage/cards/b/BrimstoneDragon.java +++ b/Mage.Sets/src/mage/cards/b/BrimstoneDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java b/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java index 4528f8f6540..f825212a342 100644 --- a/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java +++ b/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java @@ -27,11 +27,11 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/b/BrindleBoar.java b/Mage.Sets/src/mage/cards/b/BrindleBoar.java index 6637a02fdf1..666eb505085 100644 --- a/Mage.Sets/src/mage/cards/b/BrindleBoar.java +++ b/Mage.Sets/src/mage/cards/b/BrindleBoar.java @@ -28,15 +28,16 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BrindleShoat.java b/Mage.Sets/src/mage/cards/b/BrindleShoat.java index 49eb6c7d42f..de484a90138 100644 --- a/Mage.Sets/src/mage/cards/b/BrindleShoat.java +++ b/Mage.Sets/src/mage/cards/b/BrindleShoat.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrineElemental.java b/Mage.Sets/src/mage/cards/b/BrineElemental.java index fd6b1fb237f..84d310ab52c 100644 --- a/Mage.Sets/src/mage/cards/b/BrineElemental.java +++ b/Mage.Sets/src/mage/cards/b/BrineElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.turn.TurnMod; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BringLow.java b/Mage.Sets/src/mage/cards/b/BringLow.java index 7b5fcdf59f8..a79eee1ec09 100644 --- a/Mage.Sets/src/mage/cards/b/BringLow.java +++ b/Mage.Sets/src/mage/cards/b/BringLow.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BringToLight.java b/Mage.Sets/src/mage/cards/b/BringToLight.java index dcf7ff54973..f5b981b4f2b 100644 --- a/Mage.Sets/src/mage/cards/b/BringToLight.java +++ b/Mage.Sets/src/mage/cards/b/BringToLight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.ColorsOfManaSpentToCastCount; import mage.abilities.effects.OneShotEffect; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import org.apache.log4j.Logger; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BringerOfTheBlackDawn.java b/Mage.Sets/src/mage/cards/b/BringerOfTheBlackDawn.java index b8edff4b8cb..9944c9cf892 100644 --- a/Mage.Sets/src/mage/cards/b/BringerOfTheBlackDawn.java +++ b/Mage.Sets/src/mage/cards/b/BringerOfTheBlackDawn.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BringerOfTheBlueDawn.java b/Mage.Sets/src/mage/cards/b/BringerOfTheBlueDawn.java index f16901c01fd..4412591ca14 100644 --- a/Mage.Sets/src/mage/cards/b/BringerOfTheBlueDawn.java +++ b/Mage.Sets/src/mage/cards/b/BringerOfTheBlueDawn.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BringerOfTheGreenDawn.java b/Mage.Sets/src/mage/cards/b/BringerOfTheGreenDawn.java index 8b4eba3e484..d62fc4bf110 100644 --- a/Mage.Sets/src/mage/cards/b/BringerOfTheGreenDawn.java +++ b/Mage.Sets/src/mage/cards/b/BringerOfTheGreenDawn.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.game.permanent.token.BeastToken; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BringerOfTheRedDawn.java b/Mage.Sets/src/mage/cards/b/BringerOfTheRedDawn.java index 4352bb37861..0928b4e7821 100644 --- a/Mage.Sets/src/mage/cards/b/BringerOfTheRedDawn.java +++ b/Mage.Sets/src/mage/cards/b/BringerOfTheRedDawn.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -47,6 +46,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BringerOfTheWhiteDawn.java b/Mage.Sets/src/mage/cards/b/BringerOfTheWhiteDawn.java index 38b8341993d..d0f95bac9c2 100644 --- a/Mage.Sets/src/mage/cards/b/BringerOfTheWhiteDawn.java +++ b/Mage.Sets/src/mage/cards/b/BringerOfTheWhiteDawn.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BrinkOfDisaster.java b/Mage.Sets/src/mage/cards/b/BrinkOfDisaster.java index 48afe240586..8d666e478e2 100644 --- a/Mage.Sets/src/mage/cards/b/BrinkOfDisaster.java +++ b/Mage.Sets/src/mage/cards/b/BrinkOfDisaster.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/b/BrionStoutarm.java b/Mage.Sets/src/mage/cards/b/BrionStoutarm.java index 83a6d95488e..dc84e723074 100644 --- a/Mage.Sets/src/mage/cards/b/BrionStoutarm.java +++ b/Mage.Sets/src/mage/cards/b/BrionStoutarm.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -49,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -63,7 +65,7 @@ public class BrionStoutarm extends CardImpl { public BrionStoutarm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Giant"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/b/BriselaVoiceOfNightmares.java b/Mage.Sets/src/mage/cards/b/BriselaVoiceOfNightmares.java index e8d022c5bce..f071b100bbf 100644 --- a/Mage.Sets/src/mage/cards/b/BriselaVoiceOfNightmares.java +++ b/Mage.Sets/src/mage/cards/b/BriselaVoiceOfNightmares.java @@ -53,7 +53,7 @@ import java.util.UUID; public class BriselaVoiceOfNightmares extends MeldCard { public BriselaVoiceOfNightmares(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, ""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Eldrazi"); this.subtype.add("Angel"); this.power = new MageInt(9); diff --git a/Mage.Sets/src/mage/cards/b/BristlingHydra.java b/Mage.Sets/src/mage/cards/b/BristlingHydra.java index 97002c8a1ac..af60e9f1265 100644 --- a/Mage.Sets/src/mage/cards/b/BristlingHydra.java +++ b/Mage.Sets/src/mage/cards/b/BristlingHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrittleEffigy.java b/Mage.Sets/src/mage/cards/b/BrittleEffigy.java index f62fcc3f819..f7202b93f43 100644 --- a/Mage.Sets/src/mage/cards/b/BrittleEffigy.java +++ b/Mage.Sets/src/mage/cards/b/BrittleEffigy.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileSourceCost; @@ -39,8 +36,12 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BrokenAmbitions.java b/Mage.Sets/src/mage/cards/b/BrokenAmbitions.java index 14b610dedc4..37884100a3f 100644 --- a/Mage.Sets/src/mage/cards/b/BrokenAmbitions.java +++ b/Mage.Sets/src/mage/cards/b/BrokenAmbitions.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; @@ -46,6 +45,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BrokenConcentration.java b/Mage.Sets/src/mage/cards/b/BrokenConcentration.java index ae331bcce0b..a877df8cf18 100644 --- a/Mage.Sets/src/mage/cards/b/BrokenConcentration.java +++ b/Mage.Sets/src/mage/cards/b/BrokenConcentration.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.keyword.MadnessAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrokenDam.java b/Mage.Sets/src/mage/cards/b/BrokenDam.java index 08d90df075f..df9a823a52f 100644 --- a/Mage.Sets/src/mage/cards/b/BrokenDam.java +++ b/Mage.Sets/src/mage/cards/b/BrokenDam.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BrokenFall.java b/Mage.Sets/src/mage/cards/b/BrokenFall.java index 06ba74a2de6..4c8dd0a2278 100644 --- a/Mage.Sets/src/mage/cards/b/BrokenFall.java +++ b/Mage.Sets/src/mage/cards/b/BrokenFall.java @@ -27,18 +27,18 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandFromBattlefieldSourceCost; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Brontotherium.java b/Mage.Sets/src/mage/cards/b/Brontotherium.java index 626412468c2..7db980f590f 100644 --- a/Mage.Sets/src/mage/cards/b/Brontotherium.java +++ b/Mage.Sets/src/mage/cards/b/Brontotherium.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ProvokeAbility; import mage.abilities.keyword.TrampleAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/b/BronzeSable.java b/Mage.Sets/src/mage/cards/b/BronzeSable.java index 3e91f9c67b5..51d93aed169 100644 --- a/Mage.Sets/src/mage/cards/b/BronzeSable.java +++ b/Mage.Sets/src/mage/cards/b/BronzeSable.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java b/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java index cd10a4308cd..1c739309e8f 100644 --- a/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java +++ b/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java @@ -28,18 +28,19 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BroodBirthing.java b/Mage.Sets/src/mage/cards/b/BroodBirthing.java index 288ceb9cf65..db7825d2983 100644 --- a/Mage.Sets/src/mage/cards/b/BroodBirthing.java +++ b/Mage.Sets/src/mage/cards/b/BroodBirthing.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.EldraziSpawnToken; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BroodButcher.java b/Mage.Sets/src/mage/cards/b/BroodButcher.java index d9bc0fb310b..725743dab4b 100644 --- a/Mage.Sets/src/mage/cards/b/BroodButcher.java +++ b/Mage.Sets/src/mage/cards/b/BroodButcher.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.token.EldraziScionToken; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BroodKeeper.java b/Mage.Sets/src/mage/cards/b/BroodKeeper.java index 4aa0e872113..8b06fe15e7e 100644 --- a/Mage.Sets/src/mage/cards/b/BroodKeeper.java +++ b/Mage.Sets/src/mage/cards/b/BroodKeeper.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AuraAttachedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BroodMonitor.java b/Mage.Sets/src/mage/cards/b/BroodMonitor.java index 21e9c0afb03..0576d6f7218 100644 --- a/Mage.Sets/src/mage/cards/b/BroodMonitor.java +++ b/Mage.Sets/src/mage/cards/b/BroodMonitor.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.EldraziScionToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BroodSliver.java b/Mage.Sets/src/mage/cards/b/BroodSliver.java index 034c65de114..52aac00a44a 100644 --- a/Mage.Sets/src/mage/cards/b/BroodSliver.java +++ b/Mage.Sets/src/mage/cards/b/BroodSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.token.SliverToken; import mage.players.Player; +import java.util.UUID; + /** * * @author cbt33, LevelX2 (Ogre Slumlord) diff --git a/Mage.Sets/src/mage/cards/b/BroodbirthViper.java b/Mage.Sets/src/mage/cards/b/BroodbirthViper.java index 3f3014f6eb2..15ee8dde4a0 100644 --- a/Mage.Sets/src/mage/cards/b/BroodbirthViper.java +++ b/Mage.Sets/src/mage/cards/b/BroodbirthViper.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java b/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java index 468c61fd0fd..2ac34399e6c 100644 --- a/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java +++ b/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.token.InsectToken; import mage.players.Player; +import java.util.UUID; + /** * * @author Temba21 diff --git a/Mage.Sets/src/mage/cards/b/BroodhunterWurm.java b/Mage.Sets/src/mage/cards/b/BroodhunterWurm.java index 1cb9b154efc..97393862359 100644 --- a/Mage.Sets/src/mage/cards/b/BroodhunterWurm.java +++ b/Mage.Sets/src/mage/cards/b/BroodhunterWurm.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BroodingSaurian.java b/Mage.Sets/src/mage/cards/b/BroodingSaurian.java index 1103b1a5883..291b8d7514b 100644 --- a/Mage.Sets/src/mage/cards/b/BroodingSaurian.java +++ b/Mage.Sets/src/mage/cards/b/BroodingSaurian.java @@ -27,8 +27,6 @@ */ package mage.cards.b; -import java.util.Iterator; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -36,12 +34,7 @@ import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -51,6 +44,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.Iterator; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BroodmateDragon.java b/Mage.Sets/src/mage/cards/b/BroodmateDragon.java index 4f1581d7851..f9cbf0dbbfb 100644 --- a/Mage.Sets/src/mage/cards/b/BroodmateDragon.java +++ b/Mage.Sets/src/mage/cards/b/BroodmateDragon.java @@ -28,7 +28,6 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.DragonToken; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/Broodstar.java b/Mage.Sets/src/mage/cards/b/Broodstar.java index 1d66a2c00fc..6b0d8c6f501 100644 --- a/Mage.Sets/src/mage/cards/b/Broodstar.java +++ b/Mage.Sets/src/mage/cards/b/Broodstar.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -38,11 +35,14 @@ import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Broodwarden.java b/Mage.Sets/src/mage/cards/b/Broodwarden.java index 65912ada89d..46af2fc33ba 100644 --- a/Mage.Sets/src/mage/cards/b/Broodwarden.java +++ b/Mage.Sets/src/mage/cards/b/Broodwarden.java @@ -27,18 +27,19 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BrothersOfFire.java b/Mage.Sets/src/mage/cards/b/BrothersOfFire.java index 4b3d9000a3d..4061f128b08 100644 --- a/Mage.Sets/src/mage/cards/b/BrothersOfFire.java +++ b/Mage.Sets/src/mage/cards/b/BrothersOfFire.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java b/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java index 976a9133c97..79ae074cf14 100644 --- a/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java +++ b/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,10 +38,7 @@ import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; @@ -50,6 +46,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +62,7 @@ public class BrothersYamazaki extends CardImpl { public BrothersYamazaki(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/Browbeat.java b/Mage.Sets/src/mage/cards/b/Browbeat.java index fd2a2632eb4..1b72c92c6c5 100644 --- a/Mage.Sets/src/mage/cards/b/Browbeat.java +++ b/Mage.Sets/src/mage/cards/b/Browbeat.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/b/Browse.java b/Mage.Sets/src/mage/cards/b/Browse.java index a31cedc6408..9ce6d9fde04 100644 --- a/Mage.Sets/src/mage/cards/b/Browse.java +++ b/Mage.Sets/src/mage/cards/b/Browse.java @@ -27,16 +27,11 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -45,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java index 19596b621ae..9d5f7f5a447 100644 --- a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java +++ b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; @@ -52,6 +52,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetCard; import mage.target.TargetPermanent; + +import java.util.UUID; /** * @author noxx */ @@ -59,7 +61,7 @@ public class BrunaLightOfAlabaster extends CardImpl { public BrunaLightOfAlabaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java b/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java index f0b268085b5..48e1e8d033f 100644 --- a/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java +++ b/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -47,6 +47,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes @@ -63,7 +65,7 @@ public class BrunaTheFadingLight extends CardImpl { public BrunaTheFadingLight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.subtype.add("Horror"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/b/BruseTarlBoorishHerder.java b/Mage.Sets/src/mage/cards/b/BruseTarlBoorishHerder.java index 3428205b8fd..b5d111e46e1 100644 --- a/Mage.Sets/src/mage/cards/b/BruseTarlBoorishHerder.java +++ b/Mage.Sets/src/mage/cards/b/BruseTarlBoorishHerder.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; @@ -40,9 +39,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author spjspj @@ -52,7 +54,7 @@ public class BruseTarlBoorishHerder extends CardImpl { public BruseTarlBoorishHerder(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Ally"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/b/BrushWithDeath.java b/Mage.Sets/src/mage/cards/b/BrushWithDeath.java index e68a6b8637e..da694a78c8b 100644 --- a/Mage.Sets/src/mage/cards/b/BrushWithDeath.java +++ b/Mage.Sets/src/mage/cards/b/BrushWithDeath.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.BuybackAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/Brushland.java b/Mage.Sets/src/mage/cards/b/Brushland.java index 65db181439e..77ad40f4c72 100644 --- a/Mage.Sets/src/mage/cards/b/Brushland.java +++ b/Mage.Sets/src/mage/cards/b/Brushland.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Brushstrider.java b/Mage.Sets/src/mage/cards/b/Brushstrider.java index bb63d03e085..fd34e8d4fd1 100644 --- a/Mage.Sets/src/mage/cards/b/Brushstrider.java +++ b/Mage.Sets/src/mage/cards/b/Brushstrider.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/Brushwagg.java b/Mage.Sets/src/mage/cards/b/Brushwagg.java index b65be46b404..f091a47d161 100644 --- a/Mage.Sets/src/mage/cards/b/Brushwagg.java +++ b/Mage.Sets/src/mage/cards/b/Brushwagg.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BrutalDeceiver.java b/Mage.Sets/src/mage/cards/b/BrutalDeceiver.java index 1741582bd65..00f2367b66e 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalDeceiver.java +++ b/Mage.Sets/src/mage/cards/b/BrutalDeceiver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -40,17 +39,15 @@ import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java b/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java index bb80f96cab9..e350eca9f0b 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java +++ b/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.target.common.TargetCreatureOrPlaneswalker; import mage.target.common.TargetSpellOrPermanent; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrutalHordechief.java b/Mage.Sets/src/mage/cards/b/BrutalHordechief.java index 57df96e7b10..f8e08bd4b9c 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalHordechief.java +++ b/Mage.Sets/src/mage/cards/b/BrutalHordechief.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,11 +38,7 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.combat.BlocksIfAbleAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -52,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BrutalNightstalker.java b/Mage.Sets/src/mage/cards/b/BrutalNightstalker.java index 44934541a06..dc85da414fd 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalNightstalker.java +++ b/Mage.Sets/src/mage/cards/b/BrutalNightstalker.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java b/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java index 57a00f45a18..40e198560f5 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java +++ b/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -49,6 +48,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BruteForce.java b/Mage.Sets/src/mage/cards/b/BruteForce.java index f5405215b18..c295e2e19ec 100644 --- a/Mage.Sets/src/mage/cards/b/BruteForce.java +++ b/Mage.Sets/src/mage/cards/b/BruteForce.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BruteStrength.java b/Mage.Sets/src/mage/cards/b/BruteStrength.java index 639c35df1f8..c35d065a1b2 100644 --- a/Mage.Sets/src/mage/cards/b/BruteStrength.java +++ b/Mage.Sets/src/mage/cards/b/BruteStrength.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BubbleMatrix.java b/Mage.Sets/src/mage/cards/b/BubbleMatrix.java index 35a606f3b03..b99ced818f4 100644 --- a/Mage.Sets/src/mage/cards/b/BubbleMatrix.java +++ b/Mage.Sets/src/mage/cards/b/BubbleMatrix.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.PreventAllDamageToAllEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BubblingBeebles.java b/Mage.Sets/src/mage/cards/b/BubblingBeebles.java index 859d75ad5ef..21d5785ee5e 100644 --- a/Mage.Sets/src/mage/cards/b/BubblingBeebles.java +++ b/Mage.Sets/src/mage/cards/b/BubblingBeebles.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DefendingPlayerControlsCondition; @@ -38,8 +35,12 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BubblingCauldron.java b/Mage.Sets/src/mage/cards/b/BubblingCauldron.java index 59ec77a5941..92d58052193 100644 --- a/Mage.Sets/src/mage/cards/b/BubblingCauldron.java +++ b/Mage.Sets/src/mage/cards/b/BubblingCauldron.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BubblingMuck.java b/Mage.Sets/src/mage/cards/b/BubblingMuck.java index a34057f42e5..4e7d72a9413 100644 --- a/Mage.Sets/src/mage/cards/b/BubblingMuck.java +++ b/Mage.Sets/src/mage/cards/b/BubblingMuck.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.Mana; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AddManaToManaPoolTargetControllerEffect; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/b/BudokaGardener.java b/Mage.Sets/src/mage/cards/b/BudokaGardener.java index 1735e57b0d8..b9e52bd8193 100644 --- a/Mage.Sets/src/mage/cards/b/BudokaGardener.java +++ b/Mage.Sets/src/mage/cards/b/BudokaGardener.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,16 +42,15 @@ import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * @author Loki */ @@ -119,7 +117,7 @@ class DokaiWeaverofLife extends Token { DokaiWeaverofLife() { super("Dokai, Weaver of Life", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Human"); diff --git a/Mage.Sets/src/mage/cards/b/BudokaPupil.java b/Mage.Sets/src/mage/cards/b/BudokaPupil.java index fe0b70a1603..b4ac3495ec6 100644 --- a/Mage.Sets/src/mage/cards/b/BudokaPupil.java +++ b/Mage.Sets/src/mage/cards/b/BudokaPupil.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -44,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -51,6 +51,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -93,7 +95,7 @@ class IchigaWhoTopplesOaks extends Token { IchigaWhoTopplesOaks() { super("Ichiga, Who Topples Oaks", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/b/BuildersBlessing.java b/Mage.Sets/src/mage/cards/b/BuildersBlessing.java index 337ff1c5119..a5f8df2a1f3 100644 --- a/Mage.Sets/src/mage/cards/b/BuildersBlessing.java +++ b/Mage.Sets/src/mage/cards/b/BuildersBlessing.java @@ -27,11 +27,11 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterUntappedCreature; diff --git a/Mage.Sets/src/mage/cards/b/BuiltToLast.java b/Mage.Sets/src/mage/cards/b/BuiltToLast.java index 8e0d519029e..c3f4b68c2d3 100644 --- a/Mage.Sets/src/mage/cards/b/BuiltToLast.java +++ b/Mage.Sets/src/mage/cards/b/BuiltToLast.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.TargetHasCardTypeCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BuiltToSmash.java b/Mage.Sets/src/mage/cards/b/BuiltToSmash.java index f207d1e0330..0143750f2e1 100644 --- a/Mage.Sets/src/mage/cards/b/BuiltToSmash.java +++ b/Mage.Sets/src/mage/cards/b/BuiltToSmash.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.TargetHasCardTypeCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/b/BullAurochs.java b/Mage.Sets/src/mage/cards/b/BullAurochs.java index 758a389d209..1342ae8f8cc 100644 --- a/Mage.Sets/src/mage/cards/b/BullAurochs.java +++ b/Mage.Sets/src/mage/cards/b/BullAurochs.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -42,6 +41,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BullCerodon.java b/Mage.Sets/src/mage/cards/b/BullCerodon.java index bef9bc362f9..c3d643701a1 100644 --- a/Mage.Sets/src/mage/cards/b/BullCerodon.java +++ b/Mage.Sets/src/mage/cards/b/BullCerodon.java @@ -28,13 +28,14 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BullHippo.java b/Mage.Sets/src/mage/cards/b/BullHippo.java index 9c4821572fc..da070f73dd0 100644 --- a/Mage.Sets/src/mage/cards/b/BullHippo.java +++ b/Mage.Sets/src/mage/cards/b/BullHippo.java @@ -28,12 +28,13 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BullRancor.java b/Mage.Sets/src/mage/cards/b/BullRancor.java index 6a8105600d9..66cc0ab1cba 100644 --- a/Mage.Sets/src/mage/cards/b/BullRancor.java +++ b/Mage.Sets/src/mage/cards/b/BullRancor.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MonstrousCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/b/BullRush.java b/Mage.Sets/src/mage/cards/b/BullRush.java index 6b9634575f2..f3a2547666b 100644 --- a/Mage.Sets/src/mage/cards/b/BullRush.java +++ b/Mage.Sets/src/mage/cards/b/BullRush.java @@ -28,14 +28,15 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Bullwhip.java b/Mage.Sets/src/mage/cards/b/Bullwhip.java index b42cfb50fad..1bc1b16918f 100644 --- a/Mage.Sets/src/mage/cards/b/Bullwhip.java +++ b/Mage.Sets/src/mage/cards/b/Bullwhip.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/Bulwark.java b/Mage.Sets/src/mage/cards/b/Bulwark.java index e220e6ee2cd..888035ebabd 100644 --- a/Mage.Sets/src/mage/cards/b/Bulwark.java +++ b/Mage.Sets/src/mage/cards/b/Bulwark.java @@ -27,20 +27,20 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/b/BumpInTheNight.java b/Mage.Sets/src/mage/cards/b/BumpInTheNight.java index dddb168a562..7e488ad4abc 100644 --- a/Mage.Sets/src/mage/cards/b/BumpInTheNight.java +++ b/Mage.Sets/src/mage/cards/b/BumpInTheNight.java @@ -27,12 +27,12 @@ */ package mage.cards.b; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/b/Buoyancy.java b/Mage.Sets/src/mage/cards/b/Buoyancy.java index 353be6be7c0..1edc6581f6a 100644 --- a/Mage.Sets/src/mage/cards/b/Buoyancy.java +++ b/Mage.Sets/src/mage/cards/b/Buoyancy.java @@ -27,23 +27,23 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; -import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.FlashAbility; -import mage.constants.AttachmentType; -import mage.constants.Zone; -import mage.target.common.TargetCreaturePermanent; import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; -import mage.constants.Outcome; -import mage.target.TargetPermanent; +import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; +import mage.abilities.keyword.FlashAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; +import mage.target.TargetPermanent; +import mage.target.common.TargetCreaturePermanent; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BurdenOfGreed.java b/Mage.Sets/src/mage/cards/b/BurdenOfGreed.java index 19a9ff4f991..58400e0c4e6 100644 --- a/Mage.Sets/src/mage/cards/b/BurdenOfGreed.java +++ b/Mage.Sets/src/mage/cards/b/BurdenOfGreed.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author wetterlicht diff --git a/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java b/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java index 4ceaa0b6412..d8e218c773d 100644 --- a/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java +++ b/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -38,11 +35,14 @@ import mage.abilities.effects.common.TapEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Burgeoning.java b/Mage.Sets/src/mage/cards/b/Burgeoning.java index aeb7593fbc5..eddd5e1d975 100644 --- a/Mage.Sets/src/mage/cards/b/Burgeoning.java +++ b/Mage.Sets/src/mage/cards/b/Burgeoning.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author duncant */ diff --git a/Mage.Sets/src/mage/cards/b/BuriedAlive.java b/Mage.Sets/src/mage/cards/b/BuriedAlive.java index 90e03292ef6..929f7b37e85 100644 --- a/Mage.Sets/src/mage/cards/b/BuriedAlive.java +++ b/Mage.Sets/src/mage/cards/b/BuriedAlive.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author cbt33, plopman (Entomb) diff --git a/Mage.Sets/src/mage/cards/b/BuriedRuin.java b/Mage.Sets/src/mage/cards/b/BuriedRuin.java index 27240cf0dea..66d166e8d5a 100644 --- a/Mage.Sets/src/mage/cards/b/BuriedRuin.java +++ b/Mage.Sets/src/mage/cards/b/BuriedRuin.java @@ -28,9 +28,6 @@ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,10 +37,13 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java index 0d9e581e8f9..1cfd99d4dd4 100644 --- a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java +++ b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.TapVariableTargetCost; import mage.abilities.dynamicvalue.common.GetXValue; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BurnAway.java b/Mage.Sets/src/mage/cards/b/BurnAway.java index 4ce566f629e..2188ac2c12f 100644 --- a/Mage.Sets/src/mage/cards/b/BurnAway.java +++ b/Mage.Sets/src/mage/cards/b/BurnAway.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -43,6 +42,8 @@ import mage.target.Target; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BurnFromWithin.java b/Mage.Sets/src/mage/cards/b/BurnFromWithin.java index 594c3208f5f..e27a27c3b97 100644 --- a/Mage.Sets/src/mage/cards/b/BurnFromWithin.java +++ b/Mage.Sets/src/mage/cards/b/BurnFromWithin.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; @@ -47,6 +46,8 @@ import mage.target.common.TargetCreatureOrPlayer; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BurnTrail.java b/Mage.Sets/src/mage/cards/b/BurnTrail.java index 2054c390200..9e35a64fe27 100644 --- a/Mage.Sets/src/mage/cards/b/BurnTrail.java +++ b/Mage.Sets/src/mage/cards/b/BurnTrail.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.ConspireAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BurningAnger.java b/Mage.Sets/src/mage/cards/b/BurningAnger.java index 35753e70ab9..42e1993e4e5 100644 --- a/Mage.Sets/src/mage/cards/b/BurningAnger.java +++ b/Mage.Sets/src/mage/cards/b/BurningAnger.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,15 +39,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BurningCloak.java b/Mage.Sets/src/mage/cards/b/BurningCloak.java index 2c438c493e6..244e0839d38 100644 --- a/Mage.Sets/src/mage/cards/b/BurningCloak.java +++ b/Mage.Sets/src/mage/cards/b/BurningCloak.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BurningEarth.java b/Mage.Sets/src/mage/cards/b/BurningEarth.java index ed72b97e06b..eb0950150f1 100644 --- a/Mage.Sets/src/mage/cards/b/BurningEarth.java +++ b/Mage.Sets/src/mage/cards/b/BurningEarth.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.TapForManaAllTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java b/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java index 85068d9bf19..7cc6c4ae4ec 100644 --- a/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java +++ b/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BurningFields.java b/Mage.Sets/src/mage/cards/b/BurningFields.java index c8aaeae03f5..c42aef5c42e 100644 --- a/Mage.Sets/src/mage/cards/b/BurningFields.java +++ b/Mage.Sets/src/mage/cards/b/BurningFields.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/b/BurningInquiry.java b/Mage.Sets/src/mage/cards/b/BurningInquiry.java index 4bd239d3ff7..697047a164d 100644 --- a/Mage.Sets/src/mage/cards/b/BurningInquiry.java +++ b/Mage.Sets/src/mage/cards/b/BurningInquiry.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.DrawCardAllEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BurningOfXinye.java b/Mage.Sets/src/mage/cards/b/BurningOfXinye.java index 3a4d46af541..e34ef88aa96 100644 --- a/Mage.Sets/src/mage/cards/b/BurningOfXinye.java +++ b/Mage.Sets/src/mage/cards/b/BurningOfXinye.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageAllEffect; @@ -44,6 +43,8 @@ import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BurningOil.java b/Mage.Sets/src/mage/cards/b/BurningOil.java index 4e217223bb8..51b289107fd 100644 --- a/Mage.Sets/src/mage/cards/b/BurningOil.java +++ b/Mage.Sets/src/mage/cards/b/BurningOil.java @@ -27,16 +27,17 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TimingRule; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/b/BurningSands.java b/Mage.Sets/src/mage/cards/b/BurningSands.java index cdacdd746cc..a6bec6f2c9c 100644 --- a/Mage.Sets/src/mage/cards/b/BurningSands.java +++ b/Mage.Sets/src/mage/cards/b/BurningSands.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BurningShieldAskari.java b/Mage.Sets/src/mage/cards/b/BurningShieldAskari.java index 8f1a54ad911..91c80e51599 100644 --- a/Mage.Sets/src/mage/cards/b/BurningShieldAskari.java +++ b/Mage.Sets/src/mage/cards/b/BurningShieldAskari.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,9 +35,12 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java b/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java index b0c10444bdd..f42f827f528 100644 --- a/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java +++ b/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/b/BurningTreeEmissary.java b/Mage.Sets/src/mage/cards/b/BurningTreeEmissary.java index 77925152bd2..eee122ca1bc 100644 --- a/Mage.Sets/src/mage/cards/b/BurningTreeEmissary.java +++ b/Mage.Sets/src/mage/cards/b/BurningTreeEmissary.java @@ -27,14 +27,15 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BurningTreeShaman.java b/Mage.Sets/src/mage/cards/b/BurningTreeShaman.java index c77f5308e11..55f07413e4a 100644 --- a/Mage.Sets/src/mage/cards/b/BurningTreeShaman.java +++ b/Mage.Sets/src/mage/cards/b/BurningTreeShaman.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.StackAbility; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BurningVengeance.java b/Mage.Sets/src/mage/cards/b/BurningVengeance.java index 24a100e8665..5878b8c840e 100644 --- a/Mage.Sets/src/mage/cards/b/BurningVengeance.java +++ b/Mage.Sets/src/mage/cards/b/BurningVengeance.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/b/BurningWish.java b/Mage.Sets/src/mage/cards/b/BurningWish.java index fc67edefb56..f0063642ac2 100644 --- a/Mage.Sets/src/mage/cards/b/BurningWish.java +++ b/Mage.Sets/src/mage/cards/b/BurningWish.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.WishEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BurnishedHart.java b/Mage.Sets/src/mage/cards/b/BurnishedHart.java index beb8bc12bde..0db1cab9274 100644 --- a/Mage.Sets/src/mage/cards/b/BurnishedHart.java +++ b/Mage.Sets/src/mage/cards/b/BurnishedHart.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/Burnout.java b/Mage.Sets/src/mage/cards/b/Burnout.java index e150055d32c..09d460e95c2 100644 --- a/Mage.Sets/src/mage/cards/b/Burnout.java +++ b/Mage.Sets/src/mage/cards/b/Burnout.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BurntheImpure.java b/Mage.Sets/src/mage/cards/b/BurntheImpure.java index 5a9a0aa6099..0e5c7d81b7c 100644 --- a/Mage.Sets/src/mage/cards/b/BurntheImpure.java +++ b/Mage.Sets/src/mage/cards/b/BurntheImpure.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.InfectAbility; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author ayratn diff --git a/Mage.Sets/src/mage/cards/b/BurrGrafter.java b/Mage.Sets/src/mage/cards/b/BurrGrafter.java index 599d42e4b9c..a2ec59d5a9d 100644 --- a/Mage.Sets/src/mage/cards/b/BurrGrafter.java +++ b/Mage.Sets/src/mage/cards/b/BurrGrafter.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BurrentonBombardier.java b/Mage.Sets/src/mage/cards/b/BurrentonBombardier.java index 3d8c50aedd6..28f14a87cc7 100644 --- a/Mage.Sets/src/mage/cards/b/BurrentonBombardier.java +++ b/Mage.Sets/src/mage/cards/b/BurrentonBombardier.java @@ -28,14 +28,15 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ReinforceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java b/Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java index bdb374fd5d6..8e3350d6328 100644 --- a/Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java +++ b/Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BurrentonShieldBearers.java b/Mage.Sets/src/mage/cards/b/BurrentonShieldBearers.java index 54fbbe5e330..ef0970fbf00 100644 --- a/Mage.Sets/src/mage/cards/b/BurrentonShieldBearers.java +++ b/Mage.Sets/src/mage/cards/b/BurrentonShieldBearers.java @@ -27,18 +27,18 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/Burrowing.java b/Mage.Sets/src/mage/cards/b/Burrowing.java index 0cca74a0a40..2cff999a65a 100644 --- a/Mage.Sets/src/mage/cards/b/Burrowing.java +++ b/Mage.Sets/src/mage/cards/b/Burrowing.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/b/BurstLightning.java b/Mage.Sets/src/mage/cards/b/BurstLightning.java index 95ef098148c..23cd00fa473 100644 --- a/Mage.Sets/src/mage/cards/b/BurstLightning.java +++ b/Mage.Sets/src/mage/cards/b/BurstLightning.java @@ -28,16 +28,17 @@ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/b/BurstOfEnergy.java b/Mage.Sets/src/mage/cards/b/BurstOfEnergy.java index fb7cdd9e8fd..b07d4ff779f 100644 --- a/Mage.Sets/src/mage/cards/b/BurstOfEnergy.java +++ b/Mage.Sets/src/mage/cards/b/BurstOfEnergy.java @@ -27,13 +27,14 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BurstOfSpeed.java b/Mage.Sets/src/mage/cards/b/BurstOfSpeed.java index 884f18791b4..00150056706 100644 --- a/Mage.Sets/src/mage/cards/b/BurstOfSpeed.java +++ b/Mage.Sets/src/mage/cards/b/BurstOfSpeed.java @@ -27,16 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/b/BurstOfStrength.java b/Mage.Sets/src/mage/cards/b/BurstOfStrength.java index 6d902e638ae..ee94eaab3b6 100644 --- a/Mage.Sets/src/mage/cards/b/BurstOfStrength.java +++ b/Mage.Sets/src/mage/cards/b/BurstOfStrength.java @@ -27,15 +27,16 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java b/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java index 6b6425e0602..3cc03928671 100644 --- a/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java +++ b/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java @@ -30,7 +30,6 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; import mage.abilities.effects.Effect; @@ -40,10 +39,13 @@ import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author LevelX */ @@ -56,7 +58,7 @@ public class BushiTenderfoot extends CardImpl { } public BushiTenderfoot(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}"); this.subtype.add("Human"); this.subtype.add("Soldier"); @@ -85,7 +87,7 @@ class KenzoTheHardhearted extends Token { KenzoTheHardhearted() { super("Kenzo the Hardhearted", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add("Human"); diff --git a/Mage.Sets/src/mage/cards/b/ButcherGhoul.java b/Mage.Sets/src/mage/cards/b/ButcherGhoul.java index b3c1862a812..91929e9894f 100644 --- a/Mage.Sets/src/mage/cards/b/ButcherGhoul.java +++ b/Mage.Sets/src/mage/cards/b/ButcherGhoul.java @@ -27,12 +27,13 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java b/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java index 40b3d49d468..d5770e6fbb8 100644 --- a/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java +++ b/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; import mage.abilities.effects.common.SacrificeOpponentsEffect; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/b/ButcherOfTheHorde.java b/Mage.Sets/src/mage/cards/b/ButcherOfTheHorde.java index 4dbac5c2fd4..ce2fc76b969 100644 --- a/Mage.Sets/src/mage/cards/b/ButcherOfTheHorde.java +++ b/Mage.Sets/src/mage/cards/b/ButcherOfTheHorde.java @@ -27,9 +27,6 @@ */ package mage.cards.b; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -56,6 +53,10 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java index a5fa07fe486..6d374950a85 100644 --- a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java +++ b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/b/ButchersGlee.java b/Mage.Sets/src/mage/cards/b/ButchersGlee.java index db8d45a5b4a..02d0b16b738 100644 --- a/Mage.Sets/src/mage/cards/b/ButchersGlee.java +++ b/Mage.Sets/src/mage/cards/b/ButchersGlee.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/b/BygoneBishop.java b/Mage.Sets/src/mage/cards/b/BygoneBishop.java index d4c2a08083d..7c3490b6c5a 100644 --- a/Mage.Sets/src/mage/cards/b/BygoneBishop.java +++ b/Mage.Sets/src/mage/cards/b/BygoneBishop.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.keyword.InvestigateEffect; @@ -40,6 +39,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/b/BywayCourier.java b/Mage.Sets/src/mage/cards/b/BywayCourier.java index 2516a55f1ae..fe4bdcbb2e5 100644 --- a/Mage.Sets/src/mage/cards/b/BywayCourier.java +++ b/Mage.Sets/src/mage/cards/b/BywayCourier.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.keyword.InvestigateEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/C3POAndR2D2.java b/Mage.Sets/src/mage/cards/c/C3POAndR2D2.java index b3c3393f876..22d73cf5cd3 100644 --- a/Mage.Sets/src/mage/cards/c/C3POAndR2D2.java +++ b/Mage.Sets/src/mage/cards/c/C3POAndR2D2.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; @@ -38,6 +37,9 @@ import mage.abilities.keyword.RepairAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -47,7 +49,7 @@ public class C3POAndR2D2 extends CardImpl { public C3POAndR2D2(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Droid"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CabalArchon.java b/Mage.Sets/src/mage/cards/c/CabalArchon.java index 87658e77400..19e15dc1976 100644 --- a/Mage.Sets/src/mage/cards/c/CabalArchon.java +++ b/Mage.Sets/src/mage/cards/c/CabalArchon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CabalCoffers.java b/Mage.Sets/src/mage/cards/c/CabalCoffers.java index f4701b6e71c..f16c8d5697a 100644 --- a/Mage.Sets/src/mage/cards/c/CabalCoffers.java +++ b/Mage.Sets/src/mage/cards/c/CabalCoffers.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CabalConditioning.java b/Mage.Sets/src/mage/cards/c/CabalConditioning.java index 97a563397d2..b261033e598 100644 --- a/Mage.Sets/src/mage/cards/c/CabalConditioning.java +++ b/Mage.Sets/src/mage/cards/c/CabalConditioning.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; @@ -36,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/c/CabalExecutioner.java b/Mage.Sets/src/mage/cards/c/CabalExecutioner.java index 0356d4d52ed..8973e7806d2 100644 --- a/Mage.Sets/src/mage/cards/c/CabalExecutioner.java +++ b/Mage.Sets/src/mage/cards/c/CabalExecutioner.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CabalInquisitor.java b/Mage.Sets/src/mage/cards/c/CabalInquisitor.java index 9735801ddd3..d4c6d0d94d5 100644 --- a/Mage.Sets/src/mage/cards/c/CabalInquisitor.java +++ b/Mage.Sets/src/mage/cards/c/CabalInquisitor.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; @@ -42,16 +41,14 @@ import mage.abilities.effects.Effects; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.EffectType; -import mage.constants.TimingRule; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.game.Game; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CabalInterrogator.java b/Mage.Sets/src/mage/cards/c/CabalInterrogator.java index b8bdccbb4f6..bfcc0af127c 100644 --- a/Mage.Sets/src/mage/cards/c/CabalInterrogator.java +++ b/Mage.Sets/src/mage/cards/c/CabalInterrogator.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -36,11 +34,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -50,6 +44,9 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.TargetPlayer; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CabalPatriarch.java b/Mage.Sets/src/mage/cards/c/CabalPatriarch.java index 9571a2f6ae1..d4b5df04f3b 100644 --- a/Mage.Sets/src/mage/cards/c/CabalPatriarch.java +++ b/Mage.Sets/src/mage/cards/c/CabalPatriarch.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; @@ -46,6 +46,8 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author cbt33, LevelX2 @@ -54,7 +56,7 @@ public class CabalPatriarch extends CardImpl { public CabalPatriarch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/c/CabalPit.java b/Mage.Sets/src/mage/cards/c/CabalPit.java index 90b404facb5..c5b71eb8f26 100644 --- a/Mage.Sets/src/mage/cards/c/CabalPit.java +++ b/Mage.Sets/src/mage/cards/c/CabalPit.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.SacrificeSourceCost; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CabalRitual.java b/Mage.Sets/src/mage/cards/c/CabalRitual.java index ce54456006b..0c1d71abc63 100644 --- a/Mage.Sets/src/mage/cards/c/CabalRitual.java +++ b/Mage.Sets/src/mage/cards/c/CabalRitual.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.decorator.ConditionalManaEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CabalSlaver.java b/Mage.Sets/src/mage/cards/c/CabalSlaver.java index 693539a3561..e33af6e6c07 100644 --- a/Mage.Sets/src/mage/cards/c/CabalSlaver.java +++ b/Mage.Sets/src/mage/cards/c/CabalSlaver.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.SetTargetPointer; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author markedagain diff --git a/Mage.Sets/src/mage/cards/c/CabalSurgeon.java b/Mage.Sets/src/mage/cards/c/CabalSurgeon.java index cbc8265fb7d..03126c09c5f 100644 --- a/Mage.Sets/src/mage/cards/c/CabalSurgeon.java +++ b/Mage.Sets/src/mage/cards/c/CabalSurgeon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author markedagain diff --git a/Mage.Sets/src/mage/cards/c/CabalTherapy.java b/Mage.Sets/src/mage/cards/c/CabalTherapy.java index fc3fc9fb449..8b3bebb7658 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTherapy.java +++ b/Mage.Sets/src/mage/cards/c/CabalTherapy.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/c/CabalTorturer.java b/Mage.Sets/src/mage/cards/c/CabalTorturer.java index cfea1c87fe0..c5b9230e747 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTorturer.java +++ b/Mage.Sets/src/mage/cards/c/CabalTorturer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CabalTrainee.java b/Mage.Sets/src/mage/cards/c/CabalTrainee.java index d9d623be5f6..237978f6fd4 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTrainee.java +++ b/Mage.Sets/src/mage/cards/c/CabalTrainee.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CacheRaiders.java b/Mage.Sets/src/mage/cards/c/CacheRaiders.java index 75c148930fc..2d6128484ef 100644 --- a/Mage.Sets/src/mage/cards/c/CacheRaiders.java +++ b/Mage.Sets/src/mage/cards/c/CacheRaiders.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CachedDefenses.java b/Mage.Sets/src/mage/cards/c/CachedDefenses.java index 7f29d5982f9..06b264bd20e 100644 --- a/Mage.Sets/src/mage/cards/c/CachedDefenses.java +++ b/Mage.Sets/src/mage/cards/c/CachedDefenses.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.keyword.BolsterEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java b/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java index 22c7c059e95..dbac7648838 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java +++ b/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/c/CacklingFiend.java b/Mage.Sets/src/mage/cards/c/CacklingFiend.java index 7d18409cb18..956657fa8f8 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingFiend.java +++ b/Mage.Sets/src/mage/cards/c/CacklingFiend.java @@ -28,7 +28,6 @@ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CacklingFlames.java b/Mage.Sets/src/mage/cards/c/CacklingFlames.java index e4946b1444c..5c2e5a9be51 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingFlames.java +++ b/Mage.Sets/src/mage/cards/c/CacklingFlames.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.HellbentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author JotaPeRL diff --git a/Mage.Sets/src/mage/cards/c/CacklingImp.java b/Mage.Sets/src/mage/cards/c/CacklingImp.java index 4fb4e13753f..6a499090615 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingImp.java +++ b/Mage.Sets/src/mage/cards/c/CacklingImp.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CacklingWitch.java b/Mage.Sets/src/mage/cards/c/CacklingWitch.java index 3bbfd8e1be8..249130ed75f 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingWitch.java +++ b/Mage.Sets/src/mage/cards/c/CacklingWitch.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CadaverImp.java b/Mage.Sets/src/mage/cards/c/CadaverImp.java index ffdcc69aa7a..0cc5d24c375 100644 --- a/Mage.Sets/src/mage/cards/c/CadaverImp.java +++ b/Mage.Sets/src/mage/cards/c/CadaverImp.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,9 +34,12 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CadaverousBloom.java b/Mage.Sets/src/mage/cards/c/CadaverousBloom.java index 73ec03e022a..3a25055140e 100644 --- a/Mage.Sets/src/mage/cards/c/CadaverousBloom.java +++ b/Mage.Sets/src/mage/cards/c/CadaverousBloom.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.costs.common.ExileFromHandCost; import mage.abilities.mana.SimpleManaAbility; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.common.FilterOwnedCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CadaverousKnight.java b/Mage.Sets/src/mage/cards/c/CadaverousKnight.java index 096caa5e910..919d5a1151a 100644 --- a/Mage.Sets/src/mage/cards/c/CadaverousKnight.java +++ b/Mage.Sets/src/mage/cards/c/CadaverousKnight.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +34,11 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CageOfHands.java b/Mage.Sets/src/mage/cards/c/CageOfHands.java index 194ffbc0ee7..be0cc61549c 100644 --- a/Mage.Sets/src/mage/cards/c/CageOfHands.java +++ b/Mage.Sets/src/mage/cards/c/CageOfHands.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,11 +38,17 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CagedSun.java b/Mage.Sets/src/mage/cards/c/CagedSun.java index c2e245dc8d8..90120daf309 100644 --- a/Mage.Sets/src/mage/cards/c/CagedSun.java +++ b/Mage.Sets/src/mage/cards/c/CagedSun.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,13 +38,7 @@ import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -53,6 +46,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/Cagemail.java b/Mage.Sets/src/mage/cards/c/Cagemail.java index 78100ca0502..3f0b1367c0f 100644 --- a/Mage.Sets/src/mage/cards/c/Cagemail.java +++ b/Mage.Sets/src/mage/cards/c/Cagemail.java @@ -27,10 +27,9 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.combat.CantBlockAttachedEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; @@ -40,7 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; -import mage.abilities.effects.Effect; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Calciderm.java b/Mage.Sets/src/mage/cards/c/Calciderm.java index 4864062645c..3052786267e 100644 --- a/Mage.Sets/src/mage/cards/c/Calciderm.java +++ b/Mage.Sets/src/mage/cards/c/Calciderm.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CalciformPools.java b/Mage.Sets/src/mage/cards/c/CalciformPools.java index 111a6f7d970..11c97d41a40 100644 --- a/Mage.Sets/src/mage/cards/c/CalciformPools.java +++ b/Mage.Sets/src/mage/cards/c/CalciformPools.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; @@ -45,6 +44,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CalciteSnapper.java b/Mage.Sets/src/mage/cards/c/CalciteSnapper.java index 9b7b773d6c2..5d6da573fa0 100644 --- a/Mage.Sets/src/mage/cards/c/CalciteSnapper.java +++ b/Mage.Sets/src/mage/cards/c/CalciteSnapper.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.SwitchPowerToughnessSourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CalculatedDismissal.java b/Mage.Sets/src/mage/cards/c/CalculatedDismissal.java index e269a5690a7..7089623da0f 100644 --- a/Mage.Sets/src/mage/cards/c/CalculatedDismissal.java +++ b/Mage.Sets/src/mage/cards/c/CalculatedDismissal.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.condition.common.SpellMasteryCondition; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CalderaHellion.java b/Mage.Sets/src/mage/cards/c/CalderaHellion.java index 6c4585e0a89..a57058387dc 100644 --- a/Mage.Sets/src/mage/cards/c/CalderaHellion.java +++ b/Mage.Sets/src/mage/cards/c/CalderaHellion.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.DevourEffect.DevourFactor; import mage.abilities.keyword.DevourAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CalderaKavu.java b/Mage.Sets/src/mage/cards/c/CalderaKavu.java index 9a7a023a3aa..fea7940df73 100644 --- a/Mage.Sets/src/mage/cards/c/CalderaKavu.java +++ b/Mage.Sets/src/mage/cards/c/CalderaKavu.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CalderaLake.java b/Mage.Sets/src/mage/cards/c/CalderaLake.java index 6e41e5dcb73..aa8dabf8d60 100644 --- a/Mage.Sets/src/mage/cards/c/CalderaLake.java +++ b/Mage.Sets/src/mage/cards/c/CalderaLake.java @@ -27,14 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.mana.*; +import mage.abilities.mana.BlueManaAbility; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CallForBlood.java b/Mage.Sets/src/mage/cards/c/CallForBlood.java index 77393fc26f3..5d620cf788d 100644 --- a/Mage.Sets/src/mage/cards/c/CallForBlood.java +++ b/Mage.Sets/src/mage/cards/c/CallForBlood.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.dynamicvalue.DynamicValue; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CallForUnity.java b/Mage.Sets/src/mage/cards/c/CallForUnity.java index b5391cd15a6..87a58e0b236 100644 --- a/Mage.Sets/src/mage/cards/c/CallForUnity.java +++ b/Mage.Sets/src/mage/cards/c/CallForUnity.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.watchers.common.RevoltWatcher; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheConclave.java b/Mage.Sets/src/mage/cards/c/CallOfTheConclave.java index c91cfd05ae9..814e7fdd714 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheConclave.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheConclave.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.CentaurToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java b/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java index 7ee6412aa13..5432a15091f 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -43,15 +42,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java b/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java index d60fdbfe279..576df1400bc 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java @@ -27,17 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.game.permanent.token.ElephantToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java b/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java index 9e37d938a8d..23bc3d53fc2 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java @@ -27,16 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.effects.common.CipherEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheWild.java b/Mage.Sets/src/mage/cards/c/CallOfTheWild.java index c4b93b6b303..aeed2a7471a 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheWild.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheWild.java @@ -27,23 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CallTheBloodline.java b/Mage.Sets/src/mage/cards/c/CallTheBloodline.java index 1a5fd001673..a9d1ef9f032 100644 --- a/Mage.Sets/src/mage/cards/c/CallTheBloodline.java +++ b/Mage.Sets/src/mage/cards/c/CallTheBloodline.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.VampireKnightToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CallTheGatewatch.java b/Mage.Sets/src/mage/cards/c/CallTheGatewatch.java index ac3c5a6a3ee..b533059de83 100644 --- a/Mage.Sets/src/mage/cards/c/CallTheGatewatch.java +++ b/Mage.Sets/src/mage/cards/c/CallTheGatewatch.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterPlaneswalkerCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CallTheScions.java b/Mage.Sets/src/mage/cards/c/CallTheScions.java index 1801eae114e..2bce6069723 100644 --- a/Mage.Sets/src/mage/cards/c/CallTheScions.java +++ b/Mage.Sets/src/mage/cards/c/CallTheScions.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.EldraziScionToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java b/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java index e7ae133e68b..a6ff59ccba2 100644 --- a/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java +++ b/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CallToGlory.java b/Mage.Sets/src/mage/cards/c/CallToGlory.java index 1e01a85418e..18ed6672a03 100644 --- a/Mage.Sets/src/mage/cards/c/CallToGlory.java +++ b/Mage.Sets/src/mage/cards/c/CallToGlory.java @@ -28,14 +28,12 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; @@ -44,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CallToHeel.java b/Mage.Sets/src/mage/cards/c/CallToHeel.java index aa227626279..e477a43d1ab 100644 --- a/Mage.Sets/src/mage/cards/c/CallToHeel.java +++ b/Mage.Sets/src/mage/cards/c/CallToHeel.java @@ -27,20 +27,21 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CallToMind.java b/Mage.Sets/src/mage/cards/c/CallToMind.java index 150c350b546..595c4c22196 100644 --- a/Mage.Sets/src/mage/cards/c/CallToMind.java +++ b/Mage.Sets/src/mage/cards/c/CallToMind.java @@ -28,7 +28,6 @@ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterInstantOrSorceryCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CallToServe.java b/Mage.Sets/src/mage/cards/c/CallToServe.java index 0d39ded43a5..fe1e3825aa5 100644 --- a/Mage.Sets/src/mage/cards/c/CallToServe.java +++ b/Mage.Sets/src/mage/cards/c/CallToServe.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,17 +39,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CallToTheGrave.java b/Mage.Sets/src/mage/cards/c/CallToTheGrave.java index 7ff182bcdf0..0301e0dc305 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheGrave.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheGrave.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/c/CallToTheKindred.java b/Mage.Sets/src/mage/cards/c/CallToTheKindred.java index 2434490d5f1..effdb2c78c0 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheKindred.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheKindred.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -36,11 +34,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.EnchantAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -56,6 +50,9 @@ import mage.target.TargetCard; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CallToTheNetherworld.java b/Mage.Sets/src/mage/cards/c/CallToTheNetherworld.java index 26366f87238..57f4fbf2329 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheNetherworld.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheNetherworld.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; @@ -40,6 +38,8 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/c/CallerOfGales.java b/Mage.Sets/src/mage/cards/c/CallerOfGales.java index 7e2691a6359..15a1797365b 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfGales.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfGales.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +37,13 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CallerOfTheClaw.java b/Mage.Sets/src/mage/cards/c/CallerOfTheClaw.java index e2a37461d28..cacb44b340e 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfTheClaw.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfTheClaw.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.PermanentToken; import mage.game.permanent.token.BearToken; import mage.watchers.Watcher; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CallerOfThePack.java b/Mage.Sets/src/mage/cards/c/CallerOfThePack.java index a3da11668f4..09d1b6ecd9b 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfThePack.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfThePack.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.MyriadAbility; import mage.abilities.keyword.TrampleAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CallousDeceiver.java b/Mage.Sets/src/mage/cards/c/CallousDeceiver.java index ccadd5e8939..3f949b803b0 100644 --- a/Mage.Sets/src/mage/cards/c/CallousDeceiver.java +++ b/Mage.Sets/src/mage/cards/c/CallousDeceiver.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -40,11 +39,7 @@ import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -52,6 +47,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/c/CallousGiant.java b/Mage.Sets/src/mage/cards/c/CallousGiant.java index 0ef2c5e9162..f28ff377254 100644 --- a/Mage.Sets/src/mage/cards/c/CallousGiant.java +++ b/Mage.Sets/src/mage/cards/c/CallousGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CallowJushi.java b/Mage.Sets/src/mage/cards/c/CallowJushi.java index 680866b2a32..79ede1923ee 100644 --- a/Mage.Sets/src/mage/cards/c/CallowJushi.java +++ b/Mage.Sets/src/mage/cards/c/CallowJushi.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -43,6 +42,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -50,6 +50,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.token.Token; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 @@ -92,7 +94,7 @@ class JarakuTheInterloper extends Token { JarakuTheInterloper() { super("Jaraku the Interloper", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/c/CalmingLicid.java b/Mage.Sets/src/mage/cards/c/CalmingLicid.java index b96dc10b9d6..7af56d6d73d 100644 --- a/Mage.Sets/src/mage/cards/c/CalmingLicid.java +++ b/Mage.Sets/src/mage/cards/c/CalmingLicid.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LicidAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CalmingVerse.java b/Mage.Sets/src/mage/cards/c/CalmingVerse.java index e350e9cdee4..5824725b789 100644 --- a/Mage.Sets/src/mage/cards/c/CalmingVerse.java +++ b/Mage.Sets/src/mage/cards/c/CalmingVerse.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/Caltrops.java b/Mage.Sets/src/mage/cards/c/Caltrops.java index 45eb7fecb96..d3f60b15389 100644 --- a/Mage.Sets/src/mage/cards/c/Caltrops.java +++ b/Mage.Sets/src/mage/cards/c/Caltrops.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.AttacksAllTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.SetTargetPointer; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CampaignOfVengeance.java b/Mage.Sets/src/mage/cards/c/CampaignOfVengeance.java index 6f087b53690..e9c362667fd 100644 --- a/Mage.Sets/src/mage/cards/c/CampaignOfVengeance.java +++ b/Mage.Sets/src/mage/cards/c/CampaignOfVengeance.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CanalCourier.java b/Mage.Sets/src/mage/cards/c/CanalCourier.java index f4f9b982eeb..7514eb9f0e9 100644 --- a/Mage.Sets/src/mage/cards/c/CanalCourier.java +++ b/Mage.Sets/src/mage/cards/c/CanalCourier.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -45,6 +43,9 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Cancel.java b/Mage.Sets/src/mage/cards/c/Cancel.java index 2278a42d41e..84df300abca 100644 --- a/Mage.Sets/src/mage/cards/c/Cancel.java +++ b/Mage.Sets/src/mage/cards/c/Cancel.java @@ -28,13 +28,14 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java b/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java index a203852f83f..c5d13bb0368 100644 --- a/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java +++ b/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author duncant diff --git a/Mage.Sets/src/mage/cards/c/CandlesGlow.java b/Mage.Sets/src/mage/cards/c/CandlesGlow.java index 108da9be7d2..12e22fe996a 100644 --- a/Mage.Sets/src/mage/cards/c/CandlesGlow.java +++ b/Mage.Sets/src/mage/cards/c/CandlesGlow.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.keyword.SpliceOntoArcaneAbility; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java b/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java index 4b507698e48..f1f410ab09a 100644 --- a/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java +++ b/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/CankerAbomination.java b/Mage.Sets/src/mage/cards/c/CankerAbomination.java index 08b82a72916..d837962f57a 100644 --- a/Mage.Sets/src/mage/cards/c/CankerAbomination.java +++ b/Mage.Sets/src/mage/cards/c/CankerAbomination.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CankerousThirst.java b/Mage.Sets/src/mage/cards/c/CankerousThirst.java index 4971cdba6f0..f184d3facb5 100644 --- a/Mage.Sets/src/mage/cards/c/CankerousThirst.java +++ b/Mage.Sets/src/mage/cards/c/CankerousThirst.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import mage.watchers.common.ManaSpentToCastWatcher; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/Cannibalize.java b/Mage.Sets/src/mage/cards/c/Cannibalize.java index a7b41c2ea5b..8b6988a3b21 100644 --- a/Mage.Sets/src/mage/cards/c/Cannibalize.java +++ b/Mage.Sets/src/mage/cards/c/Cannibalize.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanentSameController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CanopyClaws.java b/Mage.Sets/src/mage/cards/c/CanopyClaws.java index 3be969acee3..00b8fb5c5ea 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyClaws.java +++ b/Mage.Sets/src/mage/cards/c/CanopyClaws.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.LoseAbilityTargetEffect; import mage.abilities.keyword.FlashbackAbility; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CanopyCover.java b/Mage.Sets/src/mage/cards/c/CanopyCover.java index 39e9d8af7ab..9fa17c970b2 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyCover.java +++ b/Mage.Sets/src/mage/cards/c/CanopyCover.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; @@ -38,12 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterObject; import mage.filter.FilterStackObject; import mage.game.Game; @@ -51,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/c/CanopyCrawler.java b/Mage.Sets/src/mage/cards/c/CanopyCrawler.java index cccb67840bc..566e3ef1278 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CanopyCrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CanopyDragon.java b/Mage.Sets/src/mage/cards/c/CanopyDragon.java index 9123af929be..c38d972702e 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyDragon.java +++ b/Mage.Sets/src/mage/cards/c/CanopyDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CanopyGorger.java b/Mage.Sets/src/mage/cards/c/CanopyGorger.java index 5142a005e2d..06cc7184d54 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyGorger.java +++ b/Mage.Sets/src/mage/cards/c/CanopyGorger.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CanopySpider.java b/Mage.Sets/src/mage/cards/c/CanopySpider.java index 2a4d5254249..326fa368e69 100644 --- a/Mage.Sets/src/mage/cards/c/CanopySpider.java +++ b/Mage.Sets/src/mage/cards/c/CanopySpider.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CanopySurge.java b/Mage.Sets/src/mage/cards/c/CanopySurge.java index bc96e246978..974539e4ab4 100644 --- a/Mage.Sets/src/mage/cards/c/CanopySurge.java +++ b/Mage.Sets/src/mage/cards/c/CanopySurge.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageEverythingEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CanopyVista.java b/Mage.Sets/src/mage/cards/c/CanopyVista.java index 07c138a2e0e..ebfd4bf5478 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyVista.java +++ b/Mage.Sets/src/mage/cards/c/CanopyVista.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -44,6 +42,8 @@ import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CantinaBand.java b/Mage.Sets/src/mage/cards/c/CantinaBand.java index 290b955ca05..0a892fd3907 100644 --- a/Mage.Sets/src/mage/cards/c/CantinaBand.java +++ b/Mage.Sets/src/mage/cards/c/CantinaBand.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/Cantivore.java b/Mage.Sets/src/mage/cards/c/Cantivore.java index 26994b3a562..52f39734bae 100644 --- a/Mage.Sets/src/mage/cards/c/Cantivore.java +++ b/Mage.Sets/src/mage/cards/c/Cantivore.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Loki (Mortivore), cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CanyonDrake.java b/Mage.Sets/src/mage/cards/c/CanyonDrake.java index 220cff3a9d1..0c06b94baec 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonDrake.java +++ b/Mage.Sets/src/mage/cards/c/CanyonDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CanyonLurkers.java b/Mage.Sets/src/mage/cards/c/CanyonLurkers.java index d7159a0a3f8..0e53edd2bf5 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonLurkers.java +++ b/Mage.Sets/src/mage/cards/c/CanyonLurkers.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MorphAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CanyonMinotaur.java b/Mage.Sets/src/mage/cards/c/CanyonMinotaur.java index ce4a1079178..98b556abb2f 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonMinotaur.java +++ b/Mage.Sets/src/mage/cards/c/CanyonMinotaur.java @@ -28,11 +28,12 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** diff --git a/Mage.Sets/src/mage/cards/c/CanyonWildcat.java b/Mage.Sets/src/mage/cards/c/CanyonWildcat.java index 9818d997b5d..af68c079973 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonWildcat.java +++ b/Mage.Sets/src/mage/cards/c/CanyonWildcat.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CaoCaoLordOfWei.java b/Mage.Sets/src/mage/cards/c/CaoCaoLordOfWei.java index a98e1c8b52e..4e6a39e5723 100644 --- a/Mage.Sets/src/mage/cards/c/CaoCaoLordOfWei.java +++ b/Mage.Sets/src/mage/cards/c/CaoCaoLordOfWei.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -37,9 +36,12 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 @@ -48,7 +50,7 @@ public class CaoCaoLordOfWei extends CardImpl { public CaoCaoLordOfWei(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/c/CaoRenWeiCommander.java b/Mage.Sets/src/mage/cards/c/CaoRenWeiCommander.java index 981689dddd0..ec316aeafcc 100644 --- a/Mage.Sets/src/mage/cards/c/CaoRenWeiCommander.java +++ b/Mage.Sets/src/mage/cards/c/CaoRenWeiCommander.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -35,6 +34,9 @@ import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class CaoRenWeiCommander extends CardImpl { public CaoRenWeiCommander(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/c/CapashenKnight.java b/Mage.Sets/src/mage/cards/c/CapashenKnight.java index d06a06e28ff..68a56bb5490 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenKnight.java +++ b/Mage.Sets/src/mage/cards/c/CapashenKnight.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +34,11 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CapashenStandard.java b/Mage.Sets/src/mage/cards/c/CapashenStandard.java index 1630cebc810..fa3b2a85677 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenStandard.java +++ b/Mage.Sets/src/mage/cards/c/CapashenStandard.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CapashenTemplar.java b/Mage.Sets/src/mage/cards/c/CapashenTemplar.java index 676d90cb3f5..5060709ca42 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenTemplar.java +++ b/Mage.Sets/src/mage/cards/c/CapashenTemplar.java @@ -27,16 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java b/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java index e5a479197a5..8479d65cfb9 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java +++ b/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java b/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java index e13f37773a4..e00bcbfdbb6 100644 --- a/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java +++ b/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Capsize.java b/Mage.Sets/src/mage/cards/c/Capsize.java index 5dd53d3fac8..0764a0a5567 100644 --- a/Mage.Sets/src/mage/cards/c/Capsize.java +++ b/Mage.Sets/src/mage/cards/c/Capsize.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java index 68891b02eef..fa028ce56c1 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -40,12 +37,16 @@ import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheWatch.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheWatch.java index 98ab63f3c52..7e73b465d1c 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheWatch.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheWatch.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,12 +37,15 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SoldierToken; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CaptainSisay.java b/Mage.Sets/src/mage/cards/c/CaptainSisay.java index 25679d3fb43..7e016b5c8e3 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainSisay.java +++ b/Mage.Sets/src/mage/cards/c/CaptainSisay.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -35,11 +34,14 @@ import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class CaptainSisay extends CardImpl { public CaptainSisay(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/c/CaptainsCall.java b/Mage.Sets/src/mage/cards/c/CaptainsCall.java index 6458dc18f38..643a3e86696 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainsCall.java +++ b/Mage.Sets/src/mage/cards/c/CaptainsCall.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SoldierToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CaptainsClaws.java b/Mage.Sets/src/mage/cards/c/CaptainsClaws.java index 69c974aeb6d..853c29c32ed 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainsClaws.java +++ b/Mage.Sets/src/mage/cards/c/CaptainsClaws.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.common.AttacksAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -42,6 +40,8 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.permanent.token.KorAllyToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java index 57964befec8..66aa69cfffd 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,12 +36,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -53,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CaptiveFlame.java b/Mage.Sets/src/mage/cards/c/CaptiveFlame.java index 3992d9aa8a1..ab6b67bc374 100644 --- a/Mage.Sets/src/mage/cards/c/CaptiveFlame.java +++ b/Mage.Sets/src/mage/cards/c/CaptiveFlame.java @@ -27,17 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Capture.java b/Mage.Sets/src/mage/cards/c/Capture.java index 2da94568c51..794e9cd7236 100644 --- a/Mage.Sets/src/mage/cards/c/Capture.java +++ b/Mage.Sets/src/mage/cards/c/Capture.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.condition.common.TargetHasCounterCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/CaptureOfJingzhou.java b/Mage.Sets/src/mage/cards/c/CaptureOfJingzhou.java index a11a6ac8009..23875322ea3 100644 --- a/Mage.Sets/src/mage/cards/c/CaptureOfJingzhou.java +++ b/Mage.Sets/src/mage/cards/c/CaptureOfJingzhou.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java index 3a420d12f64..55f7442ae29 100644 --- a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java +++ b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; @@ -39,11 +38,7 @@ import mage.abilities.effects.common.combat.CantAttackAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -57,6 +52,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CapturedSunlight.java b/Mage.Sets/src/mage/cards/c/CapturedSunlight.java index e7f7449e3e1..f7386e40d61 100644 --- a/Mage.Sets/src/mage/cards/c/CapturedSunlight.java +++ b/Mage.Sets/src/mage/cards/c/CapturedSunlight.java @@ -28,12 +28,13 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Carapace.java b/Mage.Sets/src/mage/cards/c/Carapace.java index 3d306c6b94b..4e97816718f 100644 --- a/Mage.Sets/src/mage/cards/c/Carapace.java +++ b/Mage.Sets/src/mage/cards/c/Carapace.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +41,8 @@ import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/c/CarapaceForger.java b/Mage.Sets/src/mage/cards/c/CarapaceForger.java index 407e612bc28..2b25bab3011 100644 --- a/Mage.Sets/src/mage/cards/c/CarapaceForger.java +++ b/Mage.Sets/src/mage/cards/c/CarapaceForger.java @@ -28,10 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; @@ -40,6 +36,11 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CaravanHurda.java b/Mage.Sets/src/mage/cards/c/CaravanHurda.java index 5a62d95409e..1f8fcc5774c 100644 --- a/Mage.Sets/src/mage/cards/c/CaravanHurda.java +++ b/Mage.Sets/src/mage/cards/c/CaravanHurda.java @@ -28,12 +28,13 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CaravanVigil.java b/Mage.Sets/src/mage/cards/c/CaravanVigil.java index 097593f20db..9e2c7c0f515 100644 --- a/Mage.Sets/src/mage/cards/c/CaravanVigil.java +++ b/Mage.Sets/src/mage/cards/c/CaravanVigil.java @@ -27,16 +27,11 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -45,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CarboniteChamber.java b/Mage.Sets/src/mage/cards/c/CarboniteChamber.java index 1aad8ddd03c..f1748b52c96 100644 --- a/Mage.Sets/src/mage/cards/c/CarboniteChamber.java +++ b/Mage.Sets/src/mage/cards/c/CarboniteChamber.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.counters.CounterType; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/Carbonize.java b/Mage.Sets/src/mage/cards/c/Carbonize.java index 26231de9419..70293d63147 100644 --- a/Mage.Sets/src/mage/cards/c/Carbonize.java +++ b/Mage.Sets/src/mage/cards/c/Carbonize.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.replacement.DealtDamageToCreatureBySourceDies; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author markedagain diff --git a/Mage.Sets/src/mage/cards/c/CarefulConsideration.java b/Mage.Sets/src/mage/cards/c/CarefulConsideration.java index e07c2e07e9b..8224b7be8db 100644 --- a/Mage.Sets/src/mage/cards/c/CarefulConsideration.java +++ b/Mage.Sets/src/mage/cards/c/CarefulConsideration.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.condition.common.MyMainPhaseCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawDiscardTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CarefulStudy.java b/Mage.Sets/src/mage/cards/c/CarefulStudy.java index 65334d90b66..10fefa33fb0 100644 --- a/Mage.Sets/src/mage/cards/c/CarefulStudy.java +++ b/Mage.Sets/src/mage/cards/c/CarefulStudy.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * @author magenoxx_at_gmail.com */ diff --git a/Mage.Sets/src/mage/cards/c/Caregiver.java b/Mage.Sets/src/mage/cards/c/Caregiver.java index 7dddaf3f348..7acbe3e93ec 100644 --- a/Mage.Sets/src/mage/cards/c/Caregiver.java +++ b/Mage.Sets/src/mage/cards/c/Caregiver.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,15 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java b/Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java index e1456c31807..21a2b1308df 100644 --- a/Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java +++ b/Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.abilities.effects.common.counter.AddPoisonCounterTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; +import mage.abilities.effects.common.counter.AddPoisonCounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index fe9a843a86c..b244e38af75 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -55,6 +54,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CarnageAltar.java b/Mage.Sets/src/mage/cards/c/CarnageAltar.java index cac6b5085c6..92cd95af537 100644 --- a/Mage.Sets/src/mage/cards/c/CarnageAltar.java +++ b/Mage.Sets/src/mage/cards/c/CarnageAltar.java @@ -27,17 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CarnageGladiator.java b/Mage.Sets/src/mage/cards/c/CarnageGladiator.java index 95b1d37507c..6e17731dd26 100644 --- a/Mage.Sets/src/mage/cards/c/CarnageGladiator.java +++ b/Mage.Sets/src/mage/cards/c/CarnageGladiator.java @@ -28,7 +28,6 @@ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + public class CarnageGladiator extends CardImpl { diff --git a/Mage.Sets/src/mage/cards/c/CarnageWurm.java b/Mage.Sets/src/mage/cards/c/CarnageWurm.java index 99269d3dfbe..8dfb5e8760d 100644 --- a/Mage.Sets/src/mage/cards/c/CarnageWurm.java +++ b/Mage.Sets/src/mage/cards/c/CarnageWurm.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Carnassid.java b/Mage.Sets/src/mage/cards/c/Carnassid.java index 0c5111557f6..d6d6133377c 100644 --- a/Mage.Sets/src/mage/cards/c/Carnassid.java +++ b/Mage.Sets/src/mage/cards/c/Carnassid.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java index 5f0a86fcca9..dd69f659a8b 100644 --- a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java +++ b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java @@ -28,10 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -43,11 +39,15 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CarnivalHellsteed.java b/Mage.Sets/src/mage/cards/c/CarnivalHellsteed.java index c69da0d495f..1be539e011e 100644 --- a/Mage.Sets/src/mage/cards/c/CarnivalHellsteed.java +++ b/Mage.Sets/src/mage/cards/c/CarnivalHellsteed.java @@ -26,15 +26,16 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.c; - -import java.util.UUID; -import mage.constants.CardType; + import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CarnivalOfSouls.java b/Mage.Sets/src/mage/cards/c/CarnivalOfSouls.java index 4f0b1878bfa..265cfef0848 100644 --- a/Mage.Sets/src/mage/cards/c/CarnivalOfSouls.java +++ b/Mage.Sets/src/mage/cards/c/CarnivalOfSouls.java @@ -27,21 +27,21 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.AddManaToManaPoolSourceControllerEffect; +import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.abilities.Ability; -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.LoseLifeSourceControllerEffect; -import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; -import mage.abilities.effects.common.AddManaToManaPoolSourceControllerEffect; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java b/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java index ad41bda097f..d47faabe31e 100644 --- a/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java +++ b/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CarnivorousPlant.java b/Mage.Sets/src/mage/cards/c/CarnivorousPlant.java index 8101b442a43..8908a8fd9ba 100644 --- a/Mage.Sets/src/mage/cards/c/CarnivorousPlant.java +++ b/Mage.Sets/src/mage/cards/c/CarnivorousPlant.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Carnophage.java b/Mage.Sets/src/mage/cards/c/Carnophage.java index b5cc8148b60..65580ef6431 100644 --- a/Mage.Sets/src/mage/cards/c/Carnophage.java +++ b/Mage.Sets/src/mage/cards/c/Carnophage.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.PayLifeCost; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Carom.java b/Mage.Sets/src/mage/cards/c/Carom.java index 6560f1dd33c..5b811fffb1a 100644 --- a/Mage.Sets/src/mage/cards/c/Carom.java +++ b/Mage.Sets/src/mage/cards/c/Carom.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.RedirectionEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Skyler Sell diff --git a/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java b/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java index d5396e47694..f12eb0b7840 100644 --- a/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java +++ b/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.LinkedHashSet; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -49,6 +47,9 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.LinkedHashSet; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CarrierPigeons.java b/Mage.Sets/src/mage/cards/c/CarrierPigeons.java index dbf0493c372..3456d5bef06 100644 --- a/Mage.Sets/src/mage/cards/c/CarrierPigeons.java +++ b/Mage.Sets/src/mage/cards/c/CarrierPigeons.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CarrierThrall.java b/Mage.Sets/src/mage/cards/c/CarrierThrall.java index 6a2f82f2ddf..f17f84bd3dd 100644 --- a/Mage.Sets/src/mage/cards/c/CarrierThrall.java +++ b/Mage.Sets/src/mage/cards/c/CarrierThrall.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.EldraziScionToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CarrionAnts.java b/Mage.Sets/src/mage/cards/c/CarrionAnts.java index b350ffc5021..3a0beba19ea 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionAnts.java +++ b/Mage.Sets/src/mage/cards/c/CarrionAnts.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CarrionBeetles.java b/Mage.Sets/src/mage/cards/c/CarrionBeetles.java index 60185b09416..d1164866b9f 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionBeetles.java +++ b/Mage.Sets/src/mage/cards/c/CarrionBeetles.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.FilterCard; import mage.game.Game; import mage.target.common.TargetCardInASingleGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CarrionCall.java b/Mage.Sets/src/mage/cards/c/CarrionCall.java index a025c6e16ca..4ff6e061411 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionCall.java +++ b/Mage.Sets/src/mage/cards/c/CarrionCall.java @@ -28,13 +28,14 @@ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.InsectInfectToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CarrionCrow.java b/Mage.Sets/src/mage/cards/c/CarrionCrow.java index 22af91f48be..97f97d33dea 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionCrow.java +++ b/Mage.Sets/src/mage/cards/c/CarrionCrow.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CarrionFeeder.java b/Mage.Sets/src/mage/cards/c/CarrionFeeder.java index 843db217074..e0b3dd8d87b 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionFeeder.java +++ b/Mage.Sets/src/mage/cards/c/CarrionFeeder.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +34,13 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/c/CarrionHowler.java b/Mage.Sets/src/mage/cards/c/CarrionHowler.java index b30e25136f6..93056808f5d 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionHowler.java +++ b/Mage.Sets/src/mage/cards/c/CarrionHowler.java @@ -27,18 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CarrionThrash.java b/Mage.Sets/src/mage/cards/c/CarrionThrash.java index aed82bb602e..ecd6b95fb05 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionThrash.java +++ b/Mage.Sets/src/mage/cards/c/CarrionThrash.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -36,10 +34,13 @@ import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CarrionWall.java b/Mage.Sets/src/mage/cards/c/CarrionWall.java index d319e917e5b..edf434730cb 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionWall.java +++ b/Mage.Sets/src/mage/cards/c/CarrionWall.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +34,11 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CartelAristocrat.java b/Mage.Sets/src/mage/cards/c/CartelAristocrat.java index c96493427d8..18b4f515dd1 100644 --- a/Mage.Sets/src/mage/cards/c/CartelAristocrat.java +++ b/Mage.Sets/src/mage/cards/c/CartelAristocrat.java @@ -27,21 +27,22 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.continuous.GainProtectionFromColorSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * Gatecrash FAQ (01.2013) You choose the color when the ability resolves. * diff --git a/Mage.Sets/src/mage/cards/c/Cartographer.java b/Mage.Sets/src/mage/cards/c/Cartographer.java index 88d34ef6af2..e189efec43a 100644 --- a/Mage.Sets/src/mage/cards/c/Cartographer.java +++ b/Mage.Sets/src/mage/cards/c/Cartographer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CarvenCaryatid.java b/Mage.Sets/src/mage/cards/c/CarvenCaryatid.java index 2c909626c69..7dfbfccaa16 100644 --- a/Mage.Sets/src/mage/cards/c/CarvenCaryatid.java +++ b/Mage.Sets/src/mage/cards/c/CarvenCaryatid.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CascadeBluffs.java b/Mage.Sets/src/mage/cards/c/CascadeBluffs.java index e45e5293c57..2c806dea4c4 100644 --- a/Mage.Sets/src/mage/cards/c/CascadeBluffs.java +++ b/Mage.Sets/src/mage/cards/c/CascadeBluffs.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,8 +35,11 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java b/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java index 59999b2b3d8..eca5dd553f5 100644 --- a/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java +++ b/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -37,14 +36,12 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CastThroughTime.java b/Mage.Sets/src/mage/cards/c/CastThroughTime.java index 191f08be73e..43085ba7b24 100644 --- a/Mage.Sets/src/mage/cards/c/CastThroughTime.java +++ b/Mage.Sets/src/mage/cards/c/CastThroughTime.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Iterator; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -36,12 +34,7 @@ import mage.abilities.keyword.ReboundAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -51,6 +44,9 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; +import java.util.Iterator; +import java.util.UUID; + /** * @author magenoxx_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/c/Castigate.java b/Mage.Sets/src/mage/cards/c/Castigate.java index da1820bd86e..157a1367496 100644 --- a/Mage.Sets/src/mage/cards/c/Castigate.java +++ b/Mage.Sets/src/mage/cards/c/Castigate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.ExileCardYouChooseTargetOpponentEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/c/Castle.java b/Mage.Sets/src/mage/cards/c/Castle.java index f0728a5884a..b786a91478c 100644 --- a/Mage.Sets/src/mage/cards/c/Castle.java +++ b/Mage.Sets/src/mage/cards/c/Castle.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterUntappedCreature; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/c/CastleRaptors.java b/Mage.Sets/src/mage/cards/c/CastleRaptors.java index 230642715b2..1a694ca9c5a 100644 --- a/Mage.Sets/src/mage/cards/c/CastleRaptors.java +++ b/Mage.Sets/src/mage/cards/c/CastleRaptors.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CastleSengir.java b/Mage.Sets/src/mage/cards/c/CastleSengir.java index 1b62c3126c0..6f0c147690c 100644 --- a/Mage.Sets/src/mage/cards/c/CastleSengir.java +++ b/Mage.Sets/src/mage/cards/c/CastleSengir.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/CatBurglar.java b/Mage.Sets/src/mage/cards/c/CatBurglar.java index 3435fde473e..a8843ad7926 100644 --- a/Mage.Sets/src/mage/cards/c/CatBurglar.java +++ b/Mage.Sets/src/mage/cards/c/CatBurglar.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CatWarriors.java b/Mage.Sets/src/mage/cards/c/CatWarriors.java index 08667431c73..e67e1a64fc0 100644 --- a/Mage.Sets/src/mage/cards/c/CatWarriors.java +++ b/Mage.Sets/src/mage/cards/c/CatWarriors.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Cataclysm.java b/Mage.Sets/src/mage/cards/c/Cataclysm.java index af938d0f1c6..ce1ce88a29b 100644 --- a/Mage.Sets/src/mage/cards/c/Cataclysm.java +++ b/Mage.Sets/src/mage/cards/c/Cataclysm.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -47,6 +44,10 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CataclysmicGearhulk.java b/Mage.Sets/src/mage/cards/c/CataclysmicGearhulk.java index 32c7e3b2754..95aff180dfe 100644 --- a/Mage.Sets/src/mage/cards/c/CataclysmicGearhulk.java +++ b/Mage.Sets/src/mage/cards/c/CataclysmicGearhulk.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -52,6 +49,10 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CatacombSifter.java b/Mage.Sets/src/mage/cards/c/CatacombSifter.java index d2ac32347e4..8bb187e1d4e 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombSifter.java +++ b/Mage.Sets/src/mage/cards/c/CatacombSifter.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.EldraziScionToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CatacombSlug.java b/Mage.Sets/src/mage/cards/c/CatacombSlug.java index b04d8d0360b..d543e7ffa2b 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombSlug.java +++ b/Mage.Sets/src/mage/cards/c/CatacombSlug.java @@ -27,11 +27,12 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Catalog.java b/Mage.Sets/src/mage/cards/c/Catalog.java index 16c22b20000..afdffa08142 100644 --- a/Mage.Sets/src/mage/cards/c/Catalog.java +++ b/Mage.Sets/src/mage/cards/c/Catalog.java @@ -27,11 +27,12 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CatapultMaster.java b/Mage.Sets/src/mage/cards/c/CatapultMaster.java index d7ce49c1352..9b43eaf3ec6 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultMaster.java +++ b/Mage.Sets/src/mage/cards/c/CatapultMaster.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +34,7 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -45,6 +43,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CatapultSquad.java b/Mage.Sets/src/mage/cards/c/CatapultSquad.java index f02f13d460f..7c8bd69d1e3 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultSquad.java +++ b/Mage.Sets/src/mage/cards/c/CatapultSquad.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/Catastrophe.java b/Mage.Sets/src/mage/cards/c/Catastrophe.java index db689574fd8..ecd1ba65fd6 100644 --- a/Mage.Sets/src/mage/cards/c/Catastrophe.java +++ b/Mage.Sets/src/mage/cards/c/Catastrophe.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CatchRelease.java b/Mage.Sets/src/mage/cards/c/CatchRelease.java index 4c3974367e7..2fba82fa900 100644 --- a/Mage.Sets/src/mage/cards/c/CatchRelease.java +++ b/Mage.Sets/src/mage/cards/c/CatchRelease.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -43,11 +40,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterPermanent; -import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.common.FilterControlledEnchantmentPermanent; -import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.common.FilterControlledPlaneswalkerPermanent; +import mage.filter.common.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -55,6 +48,10 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + public class CatchRelease extends SplitCard { public CatchRelease(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CateranBrute.java b/Mage.Sets/src/mage/cards/c/CateranBrute.java index a680c7e7739..020031ebda7 100644 --- a/Mage.Sets/src/mage/cards/c/CateranBrute.java +++ b/Mage.Sets/src/mage/cards/c/CateranBrute.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +36,16 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java index 63bfeb2e3bb..0b0976da99f 100644 --- a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java +++ b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,12 +37,16 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java index 13b6d61f441..3b3ee887132 100644 --- a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java +++ b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +36,16 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CateranOverlord.java b/Mage.Sets/src/mage/cards/c/CateranOverlord.java index dce1d0b9f4c..fb460a01be1 100644 --- a/Mage.Sets/src/mage/cards/c/CateranOverlord.java +++ b/Mage.Sets/src/mage/cards/c/CateranOverlord.java @@ -28,10 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +38,8 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -49,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CateranPersuader.java b/Mage.Sets/src/mage/cards/c/CateranPersuader.java index 602bd1fcf40..0203e10f8bb 100644 --- a/Mage.Sets/src/mage/cards/c/CateranPersuader.java +++ b/Mage.Sets/src/mage/cards/c/CateranPersuader.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +36,16 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CateranSlaver.java b/Mage.Sets/src/mage/cards/c/CateranSlaver.java index 4522c941afd..bd8e41ace3f 100644 --- a/Mage.Sets/src/mage/cards/c/CateranSlaver.java +++ b/Mage.Sets/src/mage/cards/c/CateranSlaver.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,12 +37,16 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CateranSummons.java b/Mage.Sets/src/mage/cards/c/CateranSummons.java index 938e55ea4ca..337978b295e 100644 --- a/Mage.Sets/src/mage/cards/c/CateranSummons.java +++ b/Mage.Sets/src/mage/cards/c/CateranSummons.java @@ -28,16 +28,17 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CaterwaulingBoggart.java b/Mage.Sets/src/mage/cards/c/CaterwaulingBoggart.java index 328409b881e..9af18616a71 100644 --- a/Mage.Sets/src/mage/cards/c/CaterwaulingBoggart.java +++ b/Mage.Sets/src/mage/cards/c/CaterwaulingBoggart.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CatharsCompanion.java b/Mage.Sets/src/mage/cards/c/CatharsCompanion.java index 6f15bd8c458..8c5e2987bd5 100644 --- a/Mage.Sets/src/mage/cards/c/CatharsCompanion.java +++ b/Mage.Sets/src/mage/cards/c/CatharsCompanion.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -40,6 +39,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/CatharsCrusade.java b/Mage.Sets/src/mage/cards/c/CatharsCrusade.java index 4ca6b99eeee..6d96608d37b 100644 --- a/Mage.Sets/src/mage/cards/c/CatharsCrusade.java +++ b/Mage.Sets/src/mage/cards/c/CatharsCrusade.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CatharsShield.java b/Mage.Sets/src/mage/cards/c/CatharsShield.java index 6120c6da17e..7130f04428b 100644 --- a/Mage.Sets/src/mage/cards/c/CatharsShield.java +++ b/Mage.Sets/src/mage/cards/c/CatharsShield.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -42,6 +41,8 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/CatharticAdept.java b/Mage.Sets/src/mage/cards/c/CatharticAdept.java index 2444eaf2fe8..de924a5f760 100644 --- a/Mage.Sets/src/mage/cards/c/CatharticAdept.java +++ b/Mage.Sets/src/mage/cards/c/CatharticAdept.java @@ -27,17 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CatharticReunion.java b/Mage.Sets/src/mage/cards/c/CatharticReunion.java index 907ff8090ec..10f69a32920 100644 --- a/Mage.Sets/src/mage/cards/c/CatharticReunion.java +++ b/Mage.Sets/src/mage/cards/c/CatharticReunion.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CathedralOfWar.java b/Mage.Sets/src/mage/cards/c/CathedralOfWar.java index e55d0723ed5..11514d572ef 100644 --- a/Mage.Sets/src/mage/cards/c/CathedralOfWar.java +++ b/Mage.Sets/src/mage/cards/c/CathedralOfWar.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CathedralSanctifier.java b/Mage.Sets/src/mage/cards/c/CathedralSanctifier.java index 51c58c7b9fb..ae335ddb727 100644 --- a/Mage.Sets/src/mage/cards/c/CathedralSanctifier.java +++ b/Mage.Sets/src/mage/cards/c/CathedralSanctifier.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Cathodion.java b/Mage.Sets/src/mage/cards/c/Cathodion.java index 892804ee332..3860ff0dc48 100644 --- a/Mage.Sets/src/mage/cards/c/Cathodion.java +++ b/Mage.Sets/src/mage/cards/c/Cathodion.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.common.DiesTriggeredAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java index afa4f8092d7..6342320da9f 100644 --- a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java +++ b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -37,18 +36,15 @@ import mage.abilities.effects.common.combat.CantAttackBlockAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/CauldronDance.java b/Mage.Sets/src/mage/cards/c/CauldronDance.java index 3f4815410b7..ab78e8c66f0 100644 --- a/Mage.Sets/src/mage/cards/c/CauldronDance.java +++ b/Mage.Sets/src/mage/cards/c/CauldronDance.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; @@ -50,6 +49,8 @@ import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author nomage */ diff --git a/Mage.Sets/src/mage/cards/c/CauldronHaze.java b/Mage.Sets/src/mage/cards/c/CauldronHaze.java index 7f3fbe6ed50..c36b77c256b 100644 --- a/Mage.Sets/src/mage/cards/c/CauldronHaze.java +++ b/Mage.Sets/src/mage/cards/c/CauldronHaze.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java b/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java index 3386500bcbb..2564a92f824 100644 --- a/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java +++ b/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java b/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java index d0658e0da4e..adbafd336f6 100644 --- a/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java +++ b/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CausticCrawler.java b/Mage.Sets/src/mage/cards/c/CausticCrawler.java index 6b707884483..93d5d332925 100644 --- a/Mage.Sets/src/mage/cards/c/CausticCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CausticCrawler.java @@ -27,16 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CausticHound.java b/Mage.Sets/src/mage/cards/c/CausticHound.java index d492bdfb8ec..279221ff4d9 100644 --- a/Mage.Sets/src/mage/cards/c/CausticHound.java +++ b/Mage.Sets/src/mage/cards/c/CausticHound.java @@ -28,14 +28,14 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CausticRain.java b/Mage.Sets/src/mage/cards/c/CausticRain.java index 0c7f1a8279c..5fd976b69b7 100644 --- a/Mage.Sets/src/mage/cards/c/CausticRain.java +++ b/Mage.Sets/src/mage/cards/c/CausticRain.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CausticTar.java b/Mage.Sets/src/mage/cards/c/CausticTar.java index 049b6d81c7c..9eba5ad11d3 100644 --- a/Mage.Sets/src/mage/cards/c/CausticTar.java +++ b/Mage.Sets/src/mage/cards/c/CausticTar.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,15 +37,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author cbt33, LevelX2 (Sea's Claim), LevelX2 (Pollenbright Wings) diff --git a/Mage.Sets/src/mage/cards/c/CausticWasps.java b/Mage.Sets/src/mage/cards/c/CausticWasps.java index 3e96dfd77b1..b88527e234c 100644 --- a/Mage.Sets/src/mage/cards/c/CausticWasps.java +++ b/Mage.Sets/src/mage/cards/c/CausticWasps.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DestroyTargetEffect; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Mitchel Stein diff --git a/Mage.Sets/src/mage/cards/c/CauterySliver.java b/Mage.Sets/src/mage/cards/c/CauterySliver.java index f49c00f9527..4962a7a17e2 100644 --- a/Mage.Sets/src/mage/cards/c/CauterySliver.java +++ b/Mage.Sets/src/mage/cards/c/CauterySliver.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.filter.common.FilterCreatureOrPlayer; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/CavalryMaster.java b/Mage.Sets/src/mage/cards/c/CavalryMaster.java index d40fc3317f3..4704c5e38cf 100644 --- a/Mage.Sets/src/mage/cards/c/CavalryMaster.java +++ b/Mage.Sets/src/mage/cards/c/CavalryMaster.java @@ -27,20 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CavalryPegasus.java b/Mage.Sets/src/mage/cards/c/CavalryPegasus.java index 50b8dfa7b28..1801682ff96 100644 --- a/Mage.Sets/src/mage/cards/c/CavalryPegasus.java +++ b/Mage.Sets/src/mage/cards/c/CavalryPegasus.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CaveIn.java b/Mage.Sets/src/mage/cards/c/CaveIn.java index a774eff235a..3215666b9d0 100644 --- a/Mage.Sets/src/mage/cards/c/CaveIn.java +++ b/Mage.Sets/src/mage/cards/c/CaveIn.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; @@ -41,6 +40,8 @@ import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CavePeople.java b/Mage.Sets/src/mage/cards/c/CavePeople.java index 7487abd73b8..20d5c5fb3b5 100644 --- a/Mage.Sets/src/mage/cards/c/CavePeople.java +++ b/Mage.Sets/src/mage/cards/c/CavePeople.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CaveSense.java b/Mage.Sets/src/mage/cards/c/CaveSense.java index ced1760db6b..a4fc07b4dd7 100644 --- a/Mage.Sets/src/mage/cards/c/CaveSense.java +++ b/Mage.Sets/src/mage/cards/c/CaveSense.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CaveTiger.java b/Mage.Sets/src/mage/cards/c/CaveTiger.java index 3cadb9b6e1c..077315d4a64 100644 --- a/Mage.Sets/src/mage/cards/c/CaveTiger.java +++ b/Mage.Sets/src/mage/cards/c/CaveTiger.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CavernCrawler.java b/Mage.Sets/src/mage/cards/c/CavernCrawler.java index 4582139a840..520823bc090 100644 --- a/Mage.Sets/src/mage/cards/c/CavernCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CavernCrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CavernHarpy.java b/Mage.Sets/src/mage/cards/c/CavernHarpy.java index 12385b895ad..9479ef889e2 100644 --- a/Mage.Sets/src/mage/cards/c/CavernHarpy.java +++ b/Mage.Sets/src/mage/cards/c/CavernHarpy.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CavernLampad.java b/Mage.Sets/src/mage/cards/c/CavernLampad.java index 544e9d3868c..3e75f5b8f97 100644 --- a/Mage.Sets/src/mage/cards/c/CavernLampad.java +++ b/Mage.Sets/src/mage/cards/c/CavernLampad.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.AttachmentType; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CavernOfSouls.java b/Mage.Sets/src/mage/cards/c/CavernOfSouls.java index cd2db04e94a..d68f9afce64 100644 --- a/Mage.Sets/src/mage/cards/c/CavernOfSouls.java +++ b/Mage.Sets/src/mage/cards/c/CavernOfSouls.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.ConditionalMana; import mage.MageObject; import mage.Mana; @@ -46,17 +43,17 @@ import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.abilities.mana.conditional.CreatureCastManaCondition; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.players.Player; import mage.watchers.Watcher; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/c/CavernThoctar.java b/Mage.Sets/src/mage/cards/c/CavernThoctar.java index 672c9f8faab..9c83448039e 100644 --- a/Mage.Sets/src/mage/cards/c/CavernThoctar.java +++ b/Mage.Sets/src/mage/cards/c/CavernThoctar.java @@ -28,16 +28,17 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CavesOfKoilos.java b/Mage.Sets/src/mage/cards/c/CavesOfKoilos.java index 5701f426f64..9da9e922400 100644 --- a/Mage.Sets/src/mage/cards/c/CavesOfKoilos.java +++ b/Mage.Sets/src/mage/cards/c/CavesOfKoilos.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CeaseFire.java b/Mage.Sets/src/mage/cards/c/CeaseFire.java index 086ea949ff7..ff6bdade42a 100644 --- a/Mage.Sets/src/mage/cards/c/CeaseFire.java +++ b/Mage.Sets/src/mage/cards/c/CeaseFire.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth (Steel Golem), cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java b/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java index 1eed9c01843..ff0ed860001 100644 --- a/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java +++ b/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java @@ -27,15 +27,13 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.MageInt; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; - -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterCard; @@ -43,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author Will diff --git a/Mage.Sets/src/mage/cards/c/CelestialAncient.java b/Mage.Sets/src/mage/cards/c/CelestialAncient.java index f5683fb5107..a3a23109e9c 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialAncient.java +++ b/Mage.Sets/src/mage/cards/c/CelestialAncient.java @@ -27,19 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CelestialArchon.java b/Mage.Sets/src/mage/cards/c/CelestialArchon.java index a5cd7e2d274..aa901143e65 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialArchon.java +++ b/Mage.Sets/src/mage/cards/c/CelestialArchon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.AttachmentType; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java index 9956db6405e..10ab15d23b6 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java +++ b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CelestialCrusader.java b/Mage.Sets/src/mage/cards/c/CelestialCrusader.java index 383a464a032..44dc03b702a 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialCrusader.java +++ b/Mage.Sets/src/mage/cards/c/CelestialCrusader.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -39,11 +36,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SplitSecondAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CelestialDawn.java b/Mage.Sets/src/mage/cards/c/CelestialDawn.java index a2ed2dc60a2..3ea52e72b1c 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialDawn.java +++ b/Mage.Sets/src/mage/cards/c/CelestialDawn.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,14 +38,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.ManaType; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; @@ -57,6 +49,8 @@ import mage.players.ManaPoolItem; import mage.players.Player; import mage.sets.Commander; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CelestialFlare.java b/Mage.Sets/src/mage/cards/c/CelestialFlare.java index 4669d7e2fd3..e1a06921525 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialFlare.java +++ b/Mage.Sets/src/mage/cards/c/CelestialFlare.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CelestialForce.java b/Mage.Sets/src/mage/cards/c/CelestialForce.java index 3b1921d456b..c577573adf5 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialForce.java +++ b/Mage.Sets/src/mage/cards/c/CelestialForce.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CelestialKirin.java b/Mage.Sets/src/mage/cards/c/CelestialKirin.java index 5079254b54e..fcbf638cce9 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialKirin.java +++ b/Mage.Sets/src/mage/cards/c/CelestialKirin.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterPermanent; @@ -46,6 +46,8 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class CelestialKirin extends CardImpl { public CelestialKirin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kirin"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/c/CelestialMantle.java b/Mage.Sets/src/mage/cards/c/CelestialMantle.java index 896f87a685e..1a813258bc3 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialMantle.java +++ b/Mage.Sets/src/mage/cards/c/CelestialMantle.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -50,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CelestialPrism.java b/Mage.Sets/src/mage/cards/c/CelestialPrism.java index 601182f1a05..07e31e01873 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialPrism.java +++ b/Mage.Sets/src/mage/cards/c/CelestialPrism.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author icetc diff --git a/Mage.Sets/src/mage/cards/c/CelestialPurge.java b/Mage.Sets/src/mage/cards/c/CelestialPurge.java index 558bddb7462..1af87d927b5 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialPurge.java +++ b/Mage.Sets/src/mage/cards/c/CelestialPurge.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CelestialSword.java b/Mage.Sets/src/mage/cards/c/CelestialSword.java index 33ef469455f..c9b6018f96f 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialSword.java +++ b/Mage.Sets/src/mage/cards/c/CelestialSword.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -44,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author choiseul11 diff --git a/Mage.Sets/src/mage/cards/c/CellarDoor.java b/Mage.Sets/src/mage/cards/c/CellarDoor.java index cc7df9fe989..c0817375dba 100644 --- a/Mage.Sets/src/mage/cards/c/CellarDoor.java +++ b/Mage.Sets/src/mage/cards/c/CellarDoor.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -44,6 +43,8 @@ import mage.game.permanent.token.ZombieToken; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CemeteryGate.java b/Mage.Sets/src/mage/cards/c/CemeteryGate.java index 527154e953d..f28f9f2ec82 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryGate.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryGate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.DefenderAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CemeteryPuca.java b/Mage.Sets/src/mage/cards/c/CemeteryPuca.java index bc589474b91..f1350f6f519 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryPuca.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryPuca.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; import mage.util.functions.EmptyApplyToPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java index dd567a9a7a4..6c2760d1d37 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java b/Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java index 5ab95d26d32..e1af3fc89e5 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CennsEnlistment.java b/Mage.Sets/src/mage/cards/c/CennsEnlistment.java index ce7cd03a5e7..668b3e0465d 100644 --- a/Mage.Sets/src/mage/cards/c/CennsEnlistment.java +++ b/Mage.Sets/src/mage/cards/c/CennsEnlistment.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.KithkinToken; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CennsHeir.java b/Mage.Sets/src/mage/cards/c/CennsHeir.java index 472159ec960..36ed9359a5a 100644 --- a/Mage.Sets/src/mage/cards/c/CennsHeir.java +++ b/Mage.Sets/src/mage/cards/c/CennsHeir.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CennsTactician.java b/Mage.Sets/src/mage/cards/c/CennsTactician.java index 7c3df31e3c8..6e3fc0fda51 100644 --- a/Mage.Sets/src/mage/cards/c/CennsTactician.java +++ b/Mage.Sets/src/mage/cards/c/CennsTactician.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CentaurArcher.java b/Mage.Sets/src/mage/cards/c/CentaurArcher.java index c6da02a0f7a..dd614d53a48 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurArcher.java +++ b/Mage.Sets/src/mage/cards/c/CentaurArcher.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/CentaurBattlemaster.java b/Mage.Sets/src/mage/cards/c/CentaurBattlemaster.java index cb62f062503..2117149bb5b 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurBattlemaster.java +++ b/Mage.Sets/src/mage/cards/c/CentaurBattlemaster.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.HeroicAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CentaurChieftain.java b/Mage.Sets/src/mage/cards/c/CentaurChieftain.java index cac2063f0d8..3943fdfdb40 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurChieftain.java +++ b/Mage.Sets/src/mage/cards/c/CentaurChieftain.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -48,6 +47,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CentaurCourser.java b/Mage.Sets/src/mage/cards/c/CentaurCourser.java index b13d7494d96..885f164a3bb 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurCourser.java +++ b/Mage.Sets/src/mage/cards/c/CentaurCourser.java @@ -27,11 +27,12 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CentaurGarden.java b/Mage.Sets/src/mage/cards/c/CentaurGarden.java index 6ffe9cd5a15..ee5593fde21 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurGarden.java +++ b/Mage.Sets/src/mage/cards/c/CentaurGarden.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.SacrificeSourceCost; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CentaurGlade.java b/Mage.Sets/src/mage/cards/c/CentaurGlade.java index e17adfb2be6..3b76805bd65 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurGlade.java +++ b/Mage.Sets/src/mage/cards/c/CentaurGlade.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.CentaurToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CentaurHealer.java b/Mage.Sets/src/mage/cards/c/CentaurHealer.java index 76f9e98a656..35603aee33f 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurHealer.java +++ b/Mage.Sets/src/mage/cards/c/CentaurHealer.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CentaurOmenreader.java b/Mage.Sets/src/mage/cards/c/CentaurOmenreader.java index f90f839d6b1..dce7d5647fc 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurOmenreader.java +++ b/Mage.Sets/src/mage/cards/c/CentaurOmenreader.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,12 +34,15 @@ import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author North @@ -54,7 +56,7 @@ public class CentaurOmenreader extends CardImpl { public CentaurOmenreader(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Centaur"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/c/CentaurRootcaster.java b/Mage.Sets/src/mage/cards/c/CentaurRootcaster.java index 8f0bf87cd84..0f027ebad1f 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurRootcaster.java +++ b/Mage.Sets/src/mage/cards/c/CentaurRootcaster.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CentaurSafeguard.java b/Mage.Sets/src/mage/cards/c/CentaurSafeguard.java index 233e1e1686a..96e6b21532f 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurSafeguard.java +++ b/Mage.Sets/src/mage/cards/c/CentaurSafeguard.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CentaurVeteran.java b/Mage.Sets/src/mage/cards/c/CentaurVeteran.java index 08738fd9aba..523c33e5301 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurVeteran.java +++ b/Mage.Sets/src/mage/cards/c/CentaurVeteran.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CentaurVinecrasher.java b/Mage.Sets/src/mage/cards/c/CentaurVinecrasher.java index 3274001f8c4..29d748aace2 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurVinecrasher.java +++ b/Mage.Sets/src/mage/cards/c/CentaurVinecrasher.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; @@ -47,6 +46,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterLandCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CentaursHerald.java b/Mage.Sets/src/mage/cards/c/CentaursHerald.java index d2b64c8dc9b..61b5ee0917f 100644 --- a/Mage.Sets/src/mage/cards/c/CentaursHerald.java +++ b/Mage.Sets/src/mage/cards/c/CentaursHerald.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.CentaurToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CenterSoul.java b/Mage.Sets/src/mage/cards/c/CenterSoul.java index cc0d02732de..29bb5eba256 100644 --- a/Mage.Sets/src/mage/cards/c/CenterSoul.java +++ b/Mage.Sets/src/mage/cards/c/CenterSoul.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.continuous.GainProtectionFromColorTargetEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java b/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java index 79d00d84a0c..70c8bfbe4f9 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java +++ b/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CephalidBroker.java b/Mage.Sets/src/mage/cards/c/CephalidBroker.java index 73f6f2ec086..cae73431e31 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidBroker.java +++ b/Mage.Sets/src/mage/cards/c/CephalidBroker.java @@ -27,19 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DrawCardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.discard.DiscardTargetEffect; -import mage.abilities.effects.common.DrawCardTargetEffect; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** diff --git a/Mage.Sets/src/mage/cards/c/CephalidColiseum.java b/Mage.Sets/src/mage/cards/c/CephalidColiseum.java index 0159b6a39ef..db0a3d96579 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidColiseum.java +++ b/Mage.Sets/src/mage/cards/c/CephalidColiseum.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.SacrificeSourceCost; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CephalidConstable.java b/Mage.Sets/src/mage/cards/c/CephalidConstable.java index 669258f7ad6..bf15c0adab2 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidConstable.java +++ b/Mage.Sets/src/mage/cards/c/CephalidConstable.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java index 1a28948918d..ce9f501572b 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java +++ b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTargetTriggeredAbility; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CephalidLooter.java b/Mage.Sets/src/mage/cards/c/CephalidLooter.java index 8dcd6454fd1..fe43075febc 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidLooter.java +++ b/Mage.Sets/src/mage/cards/c/CephalidLooter.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author cbt33, Loki (Merfolk Looter) diff --git a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java index d4368bdedaf..6000b503ab2 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java +++ b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CephalidSage.java b/Mage.Sets/src/mage/cards/c/CephalidSage.java index b45024911d6..ca1f383beef 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidSage.java +++ b/Mage.Sets/src/mage/cards/c/CephalidSage.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CephalidScout.java b/Mage.Sets/src/mage/cards/c/CephalidScout.java index 6734fffa316..31099a0d162 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidScout.java +++ b/Mage.Sets/src/mage/cards/c/CephalidScout.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CephalidVandal.java b/Mage.Sets/src/mage/cards/c/CephalidVandal.java index 81eb4f4e00d..3d87450d3cb 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidVandal.java +++ b/Mage.Sets/src/mage/cards/c/CephalidVandal.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CerebralEruption.java b/Mage.Sets/src/mage/cards/c/CerebralEruption.java index 0c339ece431..9fc7077e7ae 100644 --- a/Mage.Sets/src/mage/cards/c/CerebralEruption.java +++ b/Mage.Sets/src/mage/cards/c/CerebralEruption.java @@ -27,15 +27,10 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -46,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CerebralVortex.java b/Mage.Sets/src/mage/cards/c/CerebralVortex.java index 843c9999139..95bfc1feadb 100644 --- a/Mage.Sets/src/mage/cards/c/CerebralVortex.java +++ b/Mage.Sets/src/mage/cards/c/CerebralVortex.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardTargetEffect; @@ -46,6 +42,11 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CeremoniousRejection.java b/Mage.Sets/src/mage/cards/c/CeremoniousRejection.java index 911c9a713b8..cc52fb8c3d0 100644 --- a/Mage.Sets/src/mage/cards/c/CeremoniousRejection.java +++ b/Mage.Sets/src/mage/cards/c/CeremoniousRejection.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CerodonYearling.java b/Mage.Sets/src/mage/cards/c/CerodonYearling.java index 36df8f4ac32..1e0d4aaff6c 100644 --- a/Mage.Sets/src/mage/cards/c/CerodonYearling.java +++ b/Mage.Sets/src/mage/cards/c/CerodonYearling.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CertainDeath.java b/Mage.Sets/src/mage/cards/c/CertainDeath.java index 20b224a9c79..3aa548fb1a3 100644 --- a/Mage.Sets/src/mage/cards/c/CertainDeath.java +++ b/Mage.Sets/src/mage/cards/c/CertainDeath.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java index 07eaffe7b92..3b1f891a142 100644 --- a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java +++ b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CeruleanWisps.java b/Mage.Sets/src/mage/cards/c/CeruleanWisps.java index b0e471266ab..db3339a6565 100644 --- a/Mage.Sets/src/mage/cards/c/CeruleanWisps.java +++ b/Mage.Sets/src/mage/cards/c/CeruleanWisps.java @@ -28,18 +28,18 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.BecomesColorTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/c/CeruleanWyvern.java b/Mage.Sets/src/mage/cards/c/CeruleanWyvern.java index 6d78503a13a..84fa70cf2c3 100644 --- a/Mage.Sets/src/mage/cards/c/CeruleanWyvern.java +++ b/Mage.Sets/src/mage/cards/c/CeruleanWyvern.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/Cessation.java b/Mage.Sets/src/mage/cards/c/Cessation.java index 37ae79cfe96..a308b5c0c39 100644 --- a/Mage.Sets/src/mage/cards/c/Cessation.java +++ b/Mage.Sets/src/mage/cards/c/Cessation.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,9 +36,15 @@ import mage.abilities.effects.common.combat.CantAttackAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CetaDisciple.java b/Mage.Sets/src/mage/cards/c/CetaDisciple.java index 5698d166581..826e8c3395b 100644 --- a/Mage.Sets/src/mage/cards/c/CetaDisciple.java +++ b/Mage.Sets/src/mage/cards/c/CetaDisciple.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,14 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CetaSanctuary.java b/Mage.Sets/src/mage/cards/c/CetaSanctuary.java index ef3a88fc4d3..2f83340ba4c 100644 --- a/Mage.Sets/src/mage/cards/c/CetaSanctuary.java +++ b/Mage.Sets/src/mage/cards/c/CetaSanctuary.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Pete Rossi diff --git a/Mage.Sets/src/mage/cards/c/Cetavolver.java b/Mage.Sets/src/mage/cards/c/Cetavolver.java index aa2421edef1..d3f3c92b3be 100644 --- a/Mage.Sets/src/mage/cards/c/Cetavolver.java +++ b/Mage.Sets/src/mage/cards/c/Cetavolver.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCostCondition; @@ -41,8 +38,12 @@ import mage.abilities.keyword.KickerAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ChainLightning.java b/Mage.Sets/src/mage/cards/c/ChainLightning.java index bb06d3431b9..b4b616ede26 100644 --- a/Mage.Sets/src/mage/cards/c/ChainLightning.java +++ b/Mage.Sets/src/mage/cards/c/ChainLightning.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/ChainOfVapor.java b/Mage.Sets/src/mage/cards/c/ChainOfVapor.java index 5efbb59dd39..2c48d130722 100644 --- a/Mage.Sets/src/mage/cards/c/ChainOfVapor.java +++ b/Mage.Sets/src/mage/cards/c/ChainOfVapor.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ChainReaction.java b/Mage.Sets/src/mage/cards/c/ChainReaction.java index b2363ed849e..77abaab7f4e 100644 --- a/Mage.Sets/src/mage/cards/c/ChainReaction.java +++ b/Mage.Sets/src/mage/cards/c/ChainReaction.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/Chainbreaker.java b/Mage.Sets/src/mage/cards/c/Chainbreaker.java index 242b6743796..820aac1f321 100644 --- a/Mage.Sets/src/mage/cards/c/Chainbreaker.java +++ b/Mage.Sets/src/mage/cards/c/Chainbreaker.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -44,6 +43,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ChainedThroatseeker.java b/Mage.Sets/src/mage/cards/c/ChainedThroatseeker.java index 49982d0d8c2..13736e8db04 100644 --- a/Mage.Sets/src/mage/cards/c/ChainedThroatseeker.java +++ b/Mage.Sets/src/mage/cards/c/ChainedThroatseeker.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java b/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java index 3dd78a622ef..b1730aef3da 100644 --- a/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java +++ b/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility; @@ -51,6 +50,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * If the land Chained to the Rocks is enchanting stops being a Mountain or * another player gains control of it, Chained to the Rocks will be put into its diff --git a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java index 8744255b4f3..925a56dd944 100644 --- a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java +++ b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java @@ -44,10 +44,7 @@ import mage.abilities.effects.common.continuous.BecomesCreatureTypeTargetEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; @@ -77,7 +74,7 @@ public class ChainerDementiaMaster extends CardImpl { public ChainerDementiaMaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Minion"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/c/ChainersEdict.java b/Mage.Sets/src/mage/cards/c/ChainersEdict.java index 36dd945a9a3..50b25fcd3f1 100644 --- a/Mage.Sets/src/mage/cards/c/ChainersEdict.java +++ b/Mage.Sets/src/mage/cards/c/ChainersEdict.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.FlashbackAbility; @@ -38,6 +37,8 @@ import mage.constants.TimingRule; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/c/Chainflinger.java b/Mage.Sets/src/mage/cards/c/Chainflinger.java index 97e0477e503..e7959c853f9 100644 --- a/Mage.Sets/src/mage/cards/c/Chainflinger.java +++ b/Mage.Sets/src/mage/cards/c/Chainflinger.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java b/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java index b96ff02532a..6e0088dd3e9 100644 --- a/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java +++ b/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -35,17 +34,15 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.CardsDrawnDuringDrawStepWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java b/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java index 42440940396..57ce49230dd 100644 --- a/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java +++ b/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author intimidatingant diff --git a/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java b/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java index 28233c3a87c..423e21bf7cd 100644 --- a/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java +++ b/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,12 +34,15 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author intimidatingant diff --git a/Mage.Sets/src/mage/cards/c/ChaliceOfTheVoid.java b/Mage.Sets/src/mage/cards/c/ChaliceOfTheVoid.java index d6b829d2be7..03783670670 100644 --- a/Mage.Sets/src/mage/cards/c/ChaliceOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/c/ChaliceOfTheVoid.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java index 2905a071a54..e205635bae7 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java +++ b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,16 +38,14 @@ import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/ChamberedNautilus.java b/Mage.Sets/src/mage/cards/c/ChamberedNautilus.java index 4e1f73776c7..12a16485b1d 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberedNautilus.java +++ b/Mage.Sets/src/mage/cards/c/ChamberedNautilus.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChameleonColossus.java b/Mage.Sets/src/mage/cards/c/ChameleonColossus.java index 275e3f3b00c..555aef4c6d8 100644 --- a/Mage.Sets/src/mage/cards/c/ChameleonColossus.java +++ b/Mage.Sets/src/mage/cards/c/ChameleonColossus.java @@ -27,11 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +37,11 @@ import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfArashin.java b/Mage.Sets/src/mage/cards/c/ChampionOfArashin.java index 205aa577085..649679629a3 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfArashin.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfArashin.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java index 68e8bb89601..1aa9b31e63c 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java index ffd4ccc5a52..9dd3c769ce4 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java index 911905b3ec3..1e2de5f8592 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java @@ -27,19 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/c/ChampionsDrake.java b/Mage.Sets/src/mage/cards/c/ChampionsDrake.java index d18a40aaefb..47e60b3a825 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionsDrake.java +++ b/Mage.Sets/src/mage/cards/c/ChampionsDrake.java @@ -27,23 +27,23 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.abilities.CountType; -import mage.constants.CardType; import mage.MageInt; -import mage.constants.Duration; +import mage.abilities.CountType; +import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentHasCounterCondition; +import mage.abilities.decorator.ConditionalContinuousEffect; +import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.counters.CounterType; -import mage.abilities.effects.common.continuous.BoostSourceEffect; -import mage.abilities.decorator.ConditionalContinuousEffect; -import mage.abilities.common.SimpleStaticAbility; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; +import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ChampionsHelm.java b/Mage.Sets/src/mage/cards/c/ChampionsHelm.java index c4d09183eb5..0103c426014 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionsHelm.java +++ b/Mage.Sets/src/mage/cards/c/ChampionsHelm.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSupertypeCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -38,10 +37,9 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; + +import java.util.UUID; /** * @@ -61,7 +59,7 @@ public class ChampionsHelm extends CardImpl { // As long as equipped creature is legendary, it has hexproof. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT), - new EquippedHasSupertypeCondition("Legendary"), staticText))); + new EquippedHasSupertypeCondition(SuperType.LEGENDARY), staticText))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/cards/c/ChanceEncounter.java b/Mage.Sets/src/mage/cards/c/ChanceEncounter.java index c2426a31f12..2da30dfe2b1 100644 --- a/Mage.Sets/src/mage/cards/c/ChanceEncounter.java +++ b/Mage.Sets/src/mage/cards/c/ChanceEncounter.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheAnnex.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheAnnex.java index 93005c4d02a..e8706998b94 100644 --- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheAnnex.java +++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheAnnex.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheDross.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheDross.java index b11c240d171..47e76464a7c 100644 --- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheDross.java +++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheDross.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java index 9f57b3b41d2..661a8c87522 100644 --- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java +++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.ChancellorAbility; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.GoblinTokenWithHaste; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheSpires.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheSpires.java index 3d7826bb33d..319e28155c2 100644 --- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheSpires.java +++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheSpires.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -50,6 +49,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.common.TargetCardInOpponentsGraveyard; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheTangle.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheTangle.java index 3166fb06de1..c0c87864303 100644 --- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheTangle.java +++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheTangle.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.DelayedTriggeredAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/Chandler.java b/Mage.Sets/src/mage/cards/c/Chandler.java index 3ce6adf6a36..bd968323762 100644 --- a/Mage.Sets/src/mage/cards/c/Chandler.java +++ b/Mage.Sets/src/mage/cards/c/Chandler.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,11 +36,14 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -56,7 +58,7 @@ public class Chandler extends CardImpl { public Chandler(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java index 641902cae68..e6d6a6adc7d 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java +++ b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Set; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -53,6 +51,9 @@ import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetDiscard; +import java.util.Set; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java b/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java index faaec1f1a18..0b32cdd3e04 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java +++ b/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -44,11 +43,14 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 @@ -63,7 +65,7 @@ public class ChandraFireOfKaladesh extends CardImpl { public ChandraFireOfKaladesh(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Shaman"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java b/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java index 6da4abe2230..9178df62046 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java +++ b/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -49,6 +47,9 @@ import mage.game.Game; import mage.game.permanent.token.ElementalToken; import mage.players.Player; +import java.util.Set; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChandraNalaar.java b/Mage.Sets/src/mage/cards/c/ChandraNalaar.java index b829f2d7d9b..6a23e8cb4d1 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraNalaar.java +++ b/Mage.Sets/src/mage/cards/c/ChandraNalaar.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com, nantuko diff --git a/Mage.Sets/src/mage/cards/c/ChandraPyrogenius.java b/Mage.Sets/src/mage/cards/c/ChandraPyrogenius.java index 30c588f0614..8933252c84f 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraPyrogenius.java +++ b/Mage.Sets/src/mage/cards/c/ChandraPyrogenius.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.abilities.dynamicvalue.common.StaticValue; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java b/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java index 5202369badd..99ea80b7a30 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java +++ b/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -39,16 +35,8 @@ import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.combat.CantBlockTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterInstantOrSorceryCard; import mage.game.Game; @@ -62,6 +50,10 @@ import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * @author jeffwadsworth */ diff --git a/Mage.Sets/src/mage/cards/c/ChandraRoaringFlame.java b/Mage.Sets/src/mage/cards/c/ChandraRoaringFlame.java index 82b9def82df..ec9268aa4bf 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraRoaringFlame.java +++ b/Mage.Sets/src/mage/cards/c/ChandraRoaringFlame.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -49,6 +46,10 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java b/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java index 90c5b883f80..becd67689e9 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java +++ b/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -46,6 +45,8 @@ import mage.game.stack.Spell; import mage.target.common.TargetCreatureOrPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ChandraTorchOfDefiance.java b/Mage.Sets/src/mage/cards/c/ChandraTorchOfDefiance.java index ab383e871be..5098ab205f8 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraTorchOfDefiance.java +++ b/Mage.Sets/src/mage/cards/c/ChandraTorchOfDefiance.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.MageObject; import mage.Mana; import mage.abilities.Ability; @@ -57,6 +55,8 @@ import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author fireshoes */ diff --git a/Mage.Sets/src/mage/cards/c/ChandrasFury.java b/Mage.Sets/src/mage/cards/c/ChandrasFury.java index a2a823d1f6e..91346972cbe 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasFury.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasFury.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageAllControlledTargetEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/ChandrasIgnition.java b/Mage.Sets/src/mage/cards/c/ChandrasIgnition.java index f29ed9fd972..66a70d7c857 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasIgnition.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasIgnition.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChandrasOutrage.java b/Mage.Sets/src/mage/cards/c/ChandrasOutrage.java index e055e25cf4d..736c3df34b8 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasOutrage.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasOutrage.java @@ -28,7 +28,6 @@ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/ChandrasPhoenix.java b/Mage.Sets/src/mage/cards/c/ChandrasPhoenix.java index 07c6b951a37..65367b6dba5 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasPhoenix.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasPhoenix.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.StackAbility; import mage.game.stack.StackObject; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java b/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java index b08f8abf24e..7f4ae54ce1d 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/ChandrasRevolution.java b/Mage.Sets/src/mage/cards/c/ChandrasRevolution.java index 7099c2b18ee..ac7032e4bff 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasRevolution.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasRevolution.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/ChandrasSpitfire.java b/Mage.Sets/src/mage/cards/c/ChandrasSpitfire.java index 8cb4410656c..87c45c60825 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasSpitfire.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasSpitfire.java @@ -28,7 +28,6 @@ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -43,6 +42,8 @@ import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/ChangeOfHeart.java b/Mage.Sets/src/mage/cards/c/ChangeOfHeart.java index a2416a3c4ea..e586ada3cfe 100644 --- a/Mage.Sets/src/mage/cards/c/ChangeOfHeart.java +++ b/Mage.Sets/src/mage/cards/c/ChangeOfHeart.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.combat.CantAttackTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ChangelingBerserker.java b/Mage.Sets/src/mage/cards/c/ChangelingBerserker.java index f31f5cf766e..b63553a4d0e 100644 --- a/Mage.Sets/src/mage/cards/c/ChangelingBerserker.java +++ b/Mage.Sets/src/mage/cards/c/ChangelingBerserker.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ChampionAbility; import mage.abilities.keyword.ChangelingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChangelingHero.java b/Mage.Sets/src/mage/cards/c/ChangelingHero.java index e5ba762c976..b80c5ad866b 100644 --- a/Mage.Sets/src/mage/cards/c/ChangelingHero.java +++ b/Mage.Sets/src/mage/cards/c/ChangelingHero.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ChampionAbility; import mage.abilities.keyword.ChangelingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChangelingSentinel.java b/Mage.Sets/src/mage/cards/c/ChangelingSentinel.java index 19cbd2df77d..f5b8ba9308c 100644 --- a/Mage.Sets/src/mage/cards/c/ChangelingSentinel.java +++ b/Mage.Sets/src/mage/cards/c/ChangelingSentinel.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChangelingTitan.java b/Mage.Sets/src/mage/cards/c/ChangelingTitan.java index c81d05a6eb8..c2d997bd920 100644 --- a/Mage.Sets/src/mage/cards/c/ChangelingTitan.java +++ b/Mage.Sets/src/mage/cards/c/ChangelingTitan.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ChampionAbility; import mage.abilities.keyword.ChangelingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Channel.java b/Mage.Sets/src/mage/cards/c/Channel.java index 38bc39f78c4..1d33b096acb 100644 --- a/Mage.Sets/src/mage/cards/c/Channel.java +++ b/Mage.Sets/src/mage/cards/c/Channel.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/ChannelHarm.java b/Mage.Sets/src/mage/cards/c/ChannelHarm.java index df072718ee6..6a22aea28ec 100644 --- a/Mage.Sets/src/mage/cards/c/ChannelHarm.java +++ b/Mage.Sets/src/mage/cards/c/ChannelHarm.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectData; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java b/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java index 61f8f029329..b6baa2eff55 100644 --- a/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java +++ b/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -35,6 +34,10 @@ 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/ChaosCharm.java b/Mage.Sets/src/mage/cards/c/ChaosCharm.java index 81c9a8fd558..cd549d2e8a2 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosCharm.java +++ b/Mage.Sets/src/mage/cards/c/ChaosCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ChaosImps.java b/Mage.Sets/src/mage/cards/c/ChaosImps.java index 5171b4daac6..47e856de97d 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosImps.java +++ b/Mage.Sets/src/mage/cards/c/ChaosImps.java @@ -26,8 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.c; - -import java.util.UUID; + import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasCounterCondition; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChaosWarp.java b/Mage.Sets/src/mage/cards/c/ChaosWarp.java index b014b0d8f37..851e5677288 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosWarp.java +++ b/Mage.Sets/src/mage/cards/c/ChaosWarp.java @@ -27,15 +27,10 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -45,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Mitchel Stein diff --git a/Mage.Sets/src/mage/cards/c/Chaoslace.java b/Mage.Sets/src/mage/cards/c/Chaoslace.java index 6015cc892b8..e1e4fe77c6b 100644 --- a/Mage.Sets/src/mage/cards/c/Chaoslace.java +++ b/Mage.Sets/src/mage/cards/c/Chaoslace.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; +import mage.ObjectColor; import mage.abilities.effects.common.continuous.BecomesColorTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.ObjectColor; import mage.target.common.TargetSpellOrPermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/c/ChaoticBacklash.java b/Mage.Sets/src/mage/cards/c/ChaoticBacklash.java index f73f75e9d06..4029909e8a7 100644 --- a/Mage.Sets/src/mage/cards/c/ChaoticBacklash.java +++ b/Mage.Sets/src/mage/cards/c/ChaoticBacklash.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ChaoticGoo.java b/Mage.Sets/src/mage/cards/c/ChaoticGoo.java index 34fd4f37982..2bc9be057d8 100644 --- a/Mage.Sets/src/mage/cards/c/ChaoticGoo.java +++ b/Mage.Sets/src/mage/cards/c/ChaoticGoo.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChaoticStrike.java b/Mage.Sets/src/mage/cards/c/ChaoticStrike.java index fb504ea0b7a..ed81dd15eb3 100644 --- a/Mage.Sets/src/mage/cards/c/ChaoticStrike.java +++ b/Mage.Sets/src/mage/cards/c/ChaoticStrike.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; import mage.abilities.condition.common.AfterBlockersAreDeclaredCondition; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChapelGeist.java b/Mage.Sets/src/mage/cards/c/ChapelGeist.java index 32d7b73d253..37589bb54ad 100644 --- a/Mage.Sets/src/mage/cards/c/ChapelGeist.java +++ b/Mage.Sets/src/mage/cards/c/ChapelGeist.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChaplainsBlessing.java b/Mage.Sets/src/mage/cards/c/ChaplainsBlessing.java index eb8c60bbda5..2302b3541ce 100644 --- a/Mage.Sets/src/mage/cards/c/ChaplainsBlessing.java +++ b/Mage.Sets/src/mage/cards/c/ChaplainsBlessing.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/Char.java b/Mage.Sets/src/mage/cards/c/Char.java index cbc09793025..e8934c0e070 100644 --- a/Mage.Sets/src/mage/cards/c/Char.java +++ b/Mage.Sets/src/mage/cards/c/Char.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CharRumbler.java b/Mage.Sets/src/mage/cards/c/CharRumbler.java index d13e205d957..2334bfbd85d 100644 --- a/Mage.Sets/src/mage/cards/c/CharRumbler.java +++ b/Mage.Sets/src/mage/cards/c/CharRumbler.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CharcoalDiamond.java b/Mage.Sets/src/mage/cards/c/CharcoalDiamond.java index bd88644c5a3..4c979b12020 100644 --- a/Mage.Sets/src/mage/cards/c/CharcoalDiamond.java +++ b/Mage.Sets/src/mage/cards/c/CharcoalDiamond.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/c/ChargeAcrossTheAraba.java b/Mage.Sets/src/mage/cards/c/ChargeAcrossTheAraba.java index f45c5053383..b9ffcdbdc18 100644 --- a/Mage.Sets/src/mage/cards/c/ChargeAcrossTheAraba.java +++ b/Mage.Sets/src/mage/cards/c/ChargeAcrossTheAraba.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.abilities.dynamicvalue.DynamicValue; -import mage.abilities.dynamicvalue.common.SweepNumber; -import mage.abilities.effects.common.continuous.BoostControlledEffect; -import mage.abilities.effects.keyword.SweepEffect; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; + import mage.abilities.dynamicvalue.DynamicValue; + import mage.abilities.dynamicvalue.common.SweepNumber; + import mage.abilities.effects.common.continuous.BoostControlledEffect; + import mage.abilities.effects.keyword.SweepEffect; + import mage.cards.CardImpl; + import mage.cards.CardSetInfo; + import mage.constants.CardType; + import mage.constants.Duration; + + import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChargingBadger.java b/Mage.Sets/src/mage/cards/c/ChargingBadger.java index 2b7e37006ef..00c4e463b09 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingBadger.java +++ b/Mage.Sets/src/mage/cards/c/ChargingBadger.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChargingBandits.java b/Mage.Sets/src/mage/cards/c/ChargingBandits.java index 4f585b2deb1..038d6b77778 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingBandits.java +++ b/Mage.Sets/src/mage/cards/c/ChargingBandits.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java b/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java index 6a6c6610270..ce719c2c234 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java +++ b/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -49,6 +47,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.Set; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/ChargingGriffin.java b/Mage.Sets/src/mage/cards/c/ChargingGriffin.java index 4ae324c17f2..4fd4a47ba9b 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingGriffin.java +++ b/Mage.Sets/src/mage/cards/c/ChargingGriffin.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ChargingPaladin.java b/Mage.Sets/src/mage/cards/c/ChargingPaladin.java index ab5e0e959f5..81ca6b7ab04 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingPaladin.java +++ b/Mage.Sets/src/mage/cards/c/ChargingPaladin.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author daagar diff --git a/Mage.Sets/src/mage/cards/c/ChargingRhino.java b/Mage.Sets/src/mage/cards/c/ChargingRhino.java index e7caffc2a77..a7042f68f1f 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingRhino.java +++ b/Mage.Sets/src/mage/cards/c/ChargingRhino.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedByMoreThanOneSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChargingSlateback.java b/Mage.Sets/src/mage/cards/c/ChargingSlateback.java index ded6d7eef01..2d563f27dbb 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingSlateback.java +++ b/Mage.Sets/src/mage/cards/c/ChargingSlateback.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ChargingTroll.java b/Mage.Sets/src/mage/cards/c/ChargingTroll.java index 45160e988e8..5cb22990cb8 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingTroll.java +++ b/Mage.Sets/src/mage/cards/c/ChargingTroll.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChariotOfVictory.java b/Mage.Sets/src/mage/cards/c/ChariotOfVictory.java index 8b2caa788e2..69b30e7a4f7 100644 --- a/Mage.Sets/src/mage/cards/c/ChariotOfVictory.java +++ b/Mage.Sets/src/mage/cards/c/ChariotOfVictory.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java b/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java index da6a675bf85..99e733c7f0d 100644 --- a/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java +++ b/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java @@ -27,11 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -41,6 +36,10 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; @@ -50,6 +49,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.util.RandomUtil; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CharnelhoardWurm.java b/Mage.Sets/src/mage/cards/c/CharnelhoardWurm.java index ef05089f8ed..ec49e34ec3f 100644 --- a/Mage.Sets/src/mage/cards/c/CharnelhoardWurm.java +++ b/Mage.Sets/src/mage/cards/c/CharnelhoardWurm.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToOpponentTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ChartoothCougar.java b/Mage.Sets/src/mage/cards/c/ChartoothCougar.java index 1122d515363..6ee03d0cc35 100644 --- a/Mage.Sets/src/mage/cards/c/ChartoothCougar.java +++ b/Mage.Sets/src/mage/cards/c/ChartoothCougar.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.MountaincyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ChasmDrake.java b/Mage.Sets/src/mage/cards/c/ChasmDrake.java index 7007d2dc0ad..8929f7d1c93 100644 --- a/Mage.Sets/src/mage/cards/c/ChasmDrake.java +++ b/Mage.Sets/src/mage/cards/c/ChasmDrake.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/ChasmGuide.java b/Mage.Sets/src/mage/cards/c/ChasmGuide.java index 01cb511db6b..69609bf3407 100644 --- a/Mage.Sets/src/mage/cards/c/ChasmGuide.java +++ b/Mage.Sets/src/mage/cards/c/ChasmGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChasmSkulker.java b/Mage.Sets/src/mage/cards/c/ChasmSkulker.java index 7cd76f4f28b..480b4ccc77f 100644 --- a/Mage.Sets/src/mage/cards/c/ChasmSkulker.java +++ b/Mage.Sets/src/mage/cards/c/ChasmSkulker.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Chastise.java b/Mage.Sets/src/mage/cards/c/Chastise.java index e9da57e99ea..8eb87988d5e 100644 --- a/Mage.Sets/src/mage/cards/c/Chastise.java +++ b/Mage.Sets/src/mage/cards/c/Chastise.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java b/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java index 32e2cca8dd8..e7dea95c2ef 100644 --- a/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java +++ b/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.game.permanent.token.SquirrelToken; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/ChemistersTrick.java b/Mage.Sets/src/mage/cards/c/ChemistersTrick.java index 8a458cec693..276eb3d5d3f 100644 --- a/Mage.Sets/src/mage/cards/c/ChemistersTrick.java +++ b/Mage.Sets/src/mage/cards/c/ChemistersTrick.java @@ -27,12 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -42,6 +36,10 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -49,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/c/Chewbacca.java b/Mage.Sets/src/mage/cards/c/Chewbacca.java index 5c08b00c771..2e2160a6126 100644 --- a/Mage.Sets/src/mage/cards/c/Chewbacca.java +++ b/Mage.Sets/src/mage/cards/c/Chewbacca.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -55,7 +57,7 @@ public class Chewbacca extends CardImpl { public Chewbacca(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Wookiee"); this.subtype.add("Warrior"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java index 2d64e7f5f35..7c037cd4fb4 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java +++ b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,6 +38,7 @@ import mage.abilities.keyword.MonstrosityAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -50,6 +50,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.EwokToken; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -69,7 +71,7 @@ public class ChiefChirpa extends CardImpl { public ChiefChirpa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ewok"); this.subtype.add("Warrior"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/ChiefEngineer.java b/Mage.Sets/src/mage/cards/c/ChiefEngineer.java index e3ab5aa26fc..453b7151d6f 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefEngineer.java +++ b/Mage.Sets/src/mage/cards/c/ChiefEngineer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledSpellsEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterArtifactSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java index 6419764cc32..82a0fd95122 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheFoundry.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheFoundry.java index 8b309aabc70..12233a47e55 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheFoundry.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheFoundry.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java index 474a2fb5ca5..affcf3da0ad 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChildOfAlara.java b/Mage.Sets/src/mage/cards/c/ChildOfAlara.java index fa8950e96cd..b16fc65a9eb 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfAlara.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfAlara.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; @@ -35,8 +34,11 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterNonlandPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -45,7 +47,7 @@ public class ChildOfAlara extends CardImpl { public ChildOfAlara(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Avatar"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/c/ChildOfGaea.java b/Mage.Sets/src/mage/cards/c/ChildOfGaea.java index 8fce5f40f8a..6c989cb4665 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfGaea.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfGaea.java @@ -28,10 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,7 +37,11 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChildOfNight.java b/Mage.Sets/src/mage/cards/c/ChildOfNight.java index 62ac7f9148e..d96cf111f5b 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfNight.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfNight.java @@ -28,12 +28,13 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChildOfThorns.java b/Mage.Sets/src/mage/cards/c/ChildOfThorns.java index 166947ffab2..c2e62db29e5 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfThorns.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfThorns.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +34,13 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ChildhoodHorror.java b/Mage.Sets/src/mage/cards/c/ChildhoodHorror.java index 8e36f0837ea..e29f3cf9e38 100644 --- a/Mage.Sets/src/mage/cards/c/ChildhoodHorror.java +++ b/Mage.Sets/src/mage/cards/c/ChildhoodHorror.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/Chill.java b/Mage.Sets/src/mage/cards/c/Chill.java index 44f7109ba68..a4d2356c26d 100644 --- a/Mage.Sets/src/mage/cards/c/Chill.java +++ b/Mage.Sets/src/mage/cards/c/Chill.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostIncreasementAllEffect; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java b/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java index 4736af6a1d9..0d20be91c75 100644 --- a/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java +++ b/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java @@ -27,21 +27,21 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.TimingRule; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/ChillToTheBone.java b/Mage.Sets/src/mage/cards/c/ChillToTheBone.java index 2ec3785bdd2..3a8d00131fe 100644 --- a/Mage.Sets/src/mage/cards/c/ChillToTheBone.java +++ b/Mage.Sets/src/mage/cards/c/ChillToTheBone.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ChillingApparition.java b/Mage.Sets/src/mage/cards/c/ChillingApparition.java index 45cd6a6674c..89faad9832e 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingApparition.java +++ b/Mage.Sets/src/mage/cards/c/ChillingApparition.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ChillingGrasp.java b/Mage.Sets/src/mage/cards/c/ChillingGrasp.java index edc5e9f3d1f..22eb61bdfb2 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingGrasp.java +++ b/Mage.Sets/src/mage/cards/c/ChillingGrasp.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.TapTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChillingShade.java b/Mage.Sets/src/mage/cards/c/ChillingShade.java index 6f742f4f0c5..d147204ceb3 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingShade.java +++ b/Mage.Sets/src/mage/cards/c/ChillingShade.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +36,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox @@ -47,7 +49,7 @@ public class ChillingShade extends CardImpl { public ChillingShade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Shade"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/c/ChimericCoils.java b/Mage.Sets/src/mage/cards/c/ChimericCoils.java index f7fdde43cb6..ea3da2d9f44 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericCoils.java +++ b/Mage.Sets/src/mage/cards/c/ChimericCoils.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -37,15 +36,12 @@ import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ChimericIdol.java b/Mage.Sets/src/mage/cards/c/ChimericIdol.java index 9f71be4cfaf..c330636e0a8 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericIdol.java +++ b/Mage.Sets/src/mage/cards/c/ChimericIdol.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChimericMass.java b/Mage.Sets/src/mage/cards/c/ChimericMass.java index f26c0b71c08..b9a3f249150 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericMass.java +++ b/Mage.Sets/src/mage/cards/c/ChimericMass.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage.Sets/src/mage/cards/c/ChimericSphere.java b/Mage.Sets/src/mage/cards/c/ChimericSphere.java index 2bef93cac5f..47f978bf3aa 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericSphere.java +++ b/Mage.Sets/src/mage/cards/c/ChimericSphere.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ChimericStaff.java b/Mage.Sets/src/mage/cards/c/ChimericStaff.java index 31b5ff1be3b..69122831af6 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericStaff.java +++ b/Mage.Sets/src/mage/cards/c/ChimericStaff.java @@ -27,22 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/ChimneyImp.java b/Mage.Sets/src/mage/cards/c/ChimneyImp.java index f18e96d11f0..1fbf93aadd1 100644 --- a/Mage.Sets/src/mage/cards/c/ChimneyImp.java +++ b/Mage.Sets/src/mage/cards/c/ChimneyImp.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.common.TargetCardInHand; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author djbrez diff --git a/Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java b/Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java index ca1280d7f4e..966efd0de18 100644 --- a/Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java +++ b/Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.RemoveCounterCost; @@ -38,12 +34,17 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterAnyPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +60,7 @@ public class ChiseiHeartOfOceans extends CardImpl { public ChiseiHeartOfOceans(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/ChitinousCloak.java b/Mage.Sets/src/mage/cards/c/ChitinousCloak.java index 19e37d57e59..5f8911cb1c8 100644 --- a/Mage.Sets/src/mage/cards/c/ChitinousCloak.java +++ b/Mage.Sets/src/mage/cards/c/ChitinousCloak.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChitteringRats.java b/Mage.Sets/src/mage/cards/c/ChitteringRats.java index 2cb26c09037..521b1c104f3 100644 --- a/Mage.Sets/src/mage/cards/c/ChitteringRats.java +++ b/Mage.Sets/src/mage/cards/c/ChitteringRats.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.players.Player; import mage.target.common.TargetCardInHand; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Chlorophant.java b/Mage.Sets/src/mage/cards/c/Chlorophant.java index 9a71c13fe47..8c5e1507e5a 100644 --- a/Mage.Sets/src/mage/cards/c/Chlorophant.java +++ b/Mage.Sets/src/mage/cards/c/Chlorophant.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,13 +38,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java b/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java index 5cbf395f3e1..c8090763976 100644 --- a/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java +++ b/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.target.TargetSource; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/ChoArrimBruiser.java b/Mage.Sets/src/mage/cards/c/ChoArrimBruiser.java index 64371aa4ee5..d0222102d3e 100644 --- a/Mage.Sets/src/mage/cards/c/ChoArrimBruiser.java +++ b/Mage.Sets/src/mage/cards/c/ChoArrimBruiser.java @@ -27,16 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/ChoArrimLegate.java b/Mage.Sets/src/mage/cards/c/ChoArrimLegate.java index d435b6e6553..58ccf05ebe1 100644 --- a/Mage.Sets/src/mage/cards/c/ChoArrimLegate.java +++ b/Mage.Sets/src/mage/cards/c/ChoArrimLegate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.condition.CompoundCondition; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java b/Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java index 5fec7f23966..0b60722ab99 100644 --- a/Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java +++ b/Mage.Sets/src/mage/cards/c/ChoMannoRevolutionary.java @@ -27,17 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.PreventAllDamageToSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki @@ -46,7 +47,7 @@ public class ChoMannoRevolutionary extends CardImpl { public ChoMannoRevolutionary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rebel"); diff --git a/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java b/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java index 18e17b22cf6..f2024492c95 100644 --- a/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java +++ b/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChoiceOfDamnations.java b/Mage.Sets/src/mage/cards/c/ChoiceOfDamnations.java index 3eeb080a83e..5ab49d32a36 100644 --- a/Mage.Sets/src/mage/cards/c/ChoiceOfDamnations.java +++ b/Mage.Sets/src/mage/cards/c/ChoiceOfDamnations.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -43,6 +42,8 @@ import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Choke.java b/Mage.Sets/src/mage/cards/c/Choke.java index 582b945b9dd..199c54169a4 100644 --- a/Mage.Sets/src/mage/cards/c/Choke.java +++ b/Mage.Sets/src/mage/cards/c/Choke.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChokedEstuary.java b/Mage.Sets/src/mage/cards/c/ChokedEstuary.java index 0bc8702e6c0..e89059e9d44 100644 --- a/Mage.Sets/src/mage/cards/c/ChokedEstuary.java +++ b/Mage.Sets/src/mage/cards/c/ChokedEstuary.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChokingFumes.java b/Mage.Sets/src/mage/cards/c/ChokingFumes.java index 6c2718db3bc..45b169494cb 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingFumes.java +++ b/Mage.Sets/src/mage/cards/c/ChokingFumes.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java index 2f982f47a16..e06378f0acf 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java +++ b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChokingSands.java b/Mage.Sets/src/mage/cards/c/ChokingSands.java index 4a26230a475..43ffc50b911 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingSands.java +++ b/Mage.Sets/src/mage/cards/c/ChokingSands.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -96,7 +97,7 @@ class ChokingSandsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); - if (permanent != null && !permanent.getSupertype().contains("Basic")) { + if (permanent != null && !permanent.isBasic()) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { player.damage(2, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/cards/c/ChokingTethers.java b/Mage.Sets/src/mage/cards/c/ChokingTethers.java index a678ea66c68..a1964bf9cd6 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingTethers.java +++ b/Mage.Sets/src/mage/cards/c/ChokingTethers.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChordOfCalling.java b/Mage.Sets/src/mage/cards/c/ChordOfCalling.java index bd3263ae9c4..00dd2a829ea 100644 --- a/Mage.Sets/src/mage/cards/c/ChordOfCalling.java +++ b/Mage.Sets/src/mage/cards/c/ChordOfCalling.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.search.SearchLibraryWithLessCMCPutInPlayEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/c/ChorusOfMight.java b/Mage.Sets/src/mage/cards/c/ChorusOfMight.java index 6e22c7dd5c6..d2d1bde7306 100644 --- a/Mage.Sets/src/mage/cards/c/ChorusOfMight.java +++ b/Mage.Sets/src/mage/cards/c/ChorusOfMight.java @@ -28,19 +28,19 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java b/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java index 03413213287..736bee7b7ee 100644 --- a/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java +++ b/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -40,10 +37,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; @@ -51,6 +45,10 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -60,7 +58,7 @@ public class ChorusOfTheConclave extends CardImpl { public ChorusOfTheConclave(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dryad"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/c/ChorusOfTheTides.java b/Mage.Sets/src/mage/cards/c/ChorusOfTheTides.java index 96f8f65f9f3..8db67d2c4e1 100644 --- a/Mage.Sets/src/mage/cards/c/ChorusOfTheTides.java +++ b/Mage.Sets/src/mage/cards/c/ChorusOfTheTides.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.FlyingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChorusOfWoe.java b/Mage.Sets/src/mage/cards/c/ChorusOfWoe.java index 1fc2b79a452..9a98d797222 100644 --- a/Mage.Sets/src/mage/cards/c/ChorusOfWoe.java +++ b/Mage.Sets/src/mage/cards/c/ChorusOfWoe.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java b/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java index 1b4de790308..661d086cc9e 100644 --- a/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java +++ b/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java index 340bc7a0dd7..3963fca37f4 100644 --- a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java +++ b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +34,10 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.m.MarkovsServant; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.m.MarkovsServant; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -47,6 +45,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Chromanticore.java b/Mage.Sets/src/mage/cards/c/Chromanticore.java index 8fbeb94bd2e..a333849daf3 100644 --- a/Mage.Sets/src/mage/cards/c/Chromanticore.java +++ b/Mage.Sets/src/mage/cards/c/Chromanticore.java @@ -27,25 +27,21 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; -import mage.abilities.keyword.BestowAbility; -import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.FirstStrikeAbility; -import mage.abilities.keyword.VigilanceAbility; -import mage.abilities.keyword.TrampleAbility; -import mage.abilities.keyword.LifelinkAbility; +import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AttachmentType; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChromaticLantern.java b/Mage.Sets/src/mage/cards/c/ChromaticLantern.java index 35392db1bb3..d1d4965a3dd 100644 --- a/Mage.Sets/src/mage/cards/c/ChromaticLantern.java +++ b/Mage.Sets/src/mage/cards/c/ChromaticLantern.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.mana.AnyColorManaAbility; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * @author LevelX2 */ diff --git a/Mage.Sets/src/mage/cards/c/ChromaticSphere.java b/Mage.Sets/src/mage/cards/c/ChromaticSphere.java index e8ba7052825..0c6471ab97f 100644 --- a/Mage.Sets/src/mage/cards/c/ChromaticSphere.java +++ b/Mage.Sets/src/mage/cards/c/ChromaticSphere.java @@ -27,17 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.ActivatedManaAbilityImpl; +import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ChromaticStar.java b/Mage.Sets/src/mage/cards/c/ChromaticStar.java index e3a8d754d81..f457437fe0a 100644 --- a/Mage.Sets/src/mage/cards/c/ChromaticStar.java +++ b/Mage.Sets/src/mage/cards/c/ChromaticStar.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,6 +36,9 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChromeMox.java b/Mage.Sets/src/mage/cards/c/ChromeMox.java index 292d9cd2a5b..a6ac0ad6319 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeMox.java +++ b/Mage.Sets/src/mage/cards/c/ChromeMox.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; import mage.MageObject; import mage.Mana; import mage.ObjectColor; @@ -56,6 +54,9 @@ import mage.target.TargetCard; import mage.util.CardUtil; import mage.util.GameLog; +import java.util.List; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ChromeSteed.java b/Mage.Sets/src/mage/cards/c/ChromeSteed.java index e80e55ec945..23b7ea86f0a 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeSteed.java +++ b/Mage.Sets/src/mage/cards/c/ChromeSteed.java @@ -28,10 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; @@ -40,6 +36,11 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ChromescaleDrake.java b/Mage.Sets/src/mage/cards/c/ChromescaleDrake.java index 64f35a70755..9d3fe33ce6b 100644 --- a/Mage.Sets/src/mage/cards/c/ChromescaleDrake.java +++ b/Mage.Sets/src/mage/cards/c/ChromescaleDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java index f5e2361afb7..a1df31840c0 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java +++ b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Chromium.java b/Mage.Sets/src/mage/cards/c/Chromium.java index c9dc3ee8ee3..359204f2b29 100644 --- a/Mage.Sets/src/mage/cards/c/Chromium.java +++ b/Mage.Sets/src/mage/cards/c/Chromium.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +36,11 @@ import mage.abilities.keyword.RampageAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LoneFox @@ -47,7 +49,7 @@ public class Chromium extends CardImpl { public Chromium(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}{U}{U}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/c/Chronatog.java b/Mage.Sets/src/mage/cards/c/Chronatog.java index b19e0ab126c..3a32f4303c6 100644 --- a/Mage.Sets/src/mage/cards/c/Chronatog.java +++ b/Mage.Sets/src/mage/cards/c/Chronatog.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ChronatogTotem.java b/Mage.Sets/src/mage/cards/c/ChronatogTotem.java index 554a325dcc1..35f16ed988f 100644 --- a/Mage.Sets/src/mage/cards/c/ChronatogTotem.java +++ b/Mage.Sets/src/mage/cards/c/ChronatogTotem.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -51,6 +50,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/ChronicFlooding.java b/Mage.Sets/src/mage/cards/c/ChronicFlooding.java index cce3b54ba5b..9beef8117d8 100644 --- a/Mage.Sets/src/mage/cards/c/ChronicFlooding.java +++ b/Mage.Sets/src/mage/cards/c/ChronicFlooding.java @@ -27,8 +27,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.c; - -import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; import mage.target.targetpointer.FixedTarget; + +import java.util.UUID; /** * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChroniclerOfHeroes.java b/Mage.Sets/src/mage/cards/c/ChroniclerOfHeroes.java index 3a43a9a9c0b..b522b64ba24 100644 --- a/Mage.Sets/src/mage/cards/c/ChroniclerOfHeroes.java +++ b/Mage.Sets/src/mage/cards/c/ChroniclerOfHeroes.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -46,6 +45,8 @@ import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ChronomanticEscape.java b/Mage.Sets/src/mage/cards/c/ChronomanticEscape.java index 8f6034e2fe6..f25a04ed6cf 100644 --- a/Mage.Sets/src/mage/cards/c/ChronomanticEscape.java +++ b/Mage.Sets/src/mage/cards/c/ChronomanticEscape.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/Chronomaton.java b/Mage.Sets/src/mage/cards/c/Chronomaton.java index f45640e7370..57055708b5e 100644 --- a/Mage.Sets/src/mage/cards/c/Chronomaton.java +++ b/Mage.Sets/src/mage/cards/c/Chronomaton.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Chronosavant.java b/Mage.Sets/src/mage/cards/c/Chronosavant.java index 6c07708173f..d399cdb02f0 100644 --- a/Mage.Sets/src/mage/cards/c/Chronosavant.java +++ b/Mage.Sets/src/mage/cards/c/Chronosavant.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Chronostutter.java b/Mage.Sets/src/mage/cards/c/Chronostutter.java index 2bd233048b2..18a780a2376 100644 --- a/Mage.Sets/src/mage/cards/c/Chronostutter.java +++ b/Mage.Sets/src/mage/cards/c/Chronostutter.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Chronozoa.java b/Mage.Sets/src/mage/cards/c/Chronozoa.java index fd0e4bc1b5b..55b4809b30c 100644 --- a/Mage.Sets/src/mage/cards/c/Chronozoa.java +++ b/Mage.Sets/src/mage/cards/c/Chronozoa.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -45,6 +44,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Gal Lerman diff --git a/Mage.Sets/src/mage/cards/c/ChubToad.java b/Mage.Sets/src/mage/cards/c/ChubToad.java index 04f74bf2410..6de8a910d02 100644 --- a/Mage.Sets/src/mage/cards/c/ChubToad.java +++ b/Mage.Sets/src/mage/cards/c/ChubToad.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/ChurningEddy.java b/Mage.Sets/src/mage/cards/c/ChurningEddy.java index f60171d9e09..46b7bb357b6 100644 --- a/Mage.Sets/src/mage/cards/c/ChurningEddy.java +++ b/Mage.Sets/src/mage/cards/c/ChurningEddy.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CinderBarrens.java b/Mage.Sets/src/mage/cards/c/CinderBarrens.java index c5e7a24a84f..6ec632c4f7d 100644 --- a/Mage.Sets/src/mage/cards/c/CinderBarrens.java +++ b/Mage.Sets/src/mage/cards/c/CinderBarrens.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CinderElemental.java b/Mage.Sets/src/mage/cards/c/CinderElemental.java index f45ec4d2459..5b3ecabd011 100644 --- a/Mage.Sets/src/mage/cards/c/CinderElemental.java +++ b/Mage.Sets/src/mage/cards/c/CinderElemental.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,9 +37,12 @@ import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CinderGiant.java b/Mage.Sets/src/mage/cards/c/CinderGiant.java index e243e1b98e2..c2d0a552bbd 100644 --- a/Mage.Sets/src/mage/cards/c/CinderGiant.java +++ b/Mage.Sets/src/mage/cards/c/CinderGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; @@ -38,6 +37,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CinderGlade.java b/Mage.Sets/src/mage/cards/c/CinderGlade.java index 51e9f095f69..067db035aac 100644 --- a/Mage.Sets/src/mage/cards/c/CinderGlade.java +++ b/Mage.Sets/src/mage/cards/c/CinderGlade.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -41,9 +39,12 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -53,7 +54,7 @@ public class CinderGlade extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public CinderGlade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CinderHellion.java b/Mage.Sets/src/mage/cards/c/CinderHellion.java index 388b7809273..ca1f71ebcc1 100644 --- a/Mage.Sets/src/mage/cards/c/CinderHellion.java +++ b/Mage.Sets/src/mage/cards/c/CinderHellion.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CinderMarsh.java b/Mage.Sets/src/mage/cards/c/CinderMarsh.java index 381ddeb4ab4..7e49ec58898 100644 --- a/Mage.Sets/src/mage/cards/c/CinderMarsh.java +++ b/Mage.Sets/src/mage/cards/c/CinderMarsh.java @@ -27,13 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEffect; -import mage.abilities.mana.*; +import mage.abilities.mana.BlackManaAbility; +import mage.abilities.mana.ColorlessManaAbility; +import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CinderPyromancer.java b/Mage.Sets/src/mage/cards/c/CinderPyromancer.java index 3e4b32effd5..baf42c3c24d 100644 --- a/Mage.Sets/src/mage/cards/c/CinderPyromancer.java +++ b/Mage.Sets/src/mage/cards/c/CinderPyromancer.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,11 +38,14 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CinderShade.java b/Mage.Sets/src/mage/cards/c/CinderShade.java index c954ad63ba4..95c11ec28d1 100644 --- a/Mage.Sets/src/mage/cards/c/CinderShade.java +++ b/Mage.Sets/src/mage/cards/c/CinderShade.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/c/CinderStorm.java b/Mage.Sets/src/mage/cards/c/CinderStorm.java index c18fea10f18..38fbfb96cc5 100644 --- a/Mage.Sets/src/mage/cards/c/CinderStorm.java +++ b/Mage.Sets/src/mage/cards/c/CinderStorm.java @@ -27,14 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/c/CinderWall.java b/Mage.Sets/src/mage/cards/c/CinderWall.java index f96138842f4..c61245cf526 100644 --- a/Mage.Sets/src/mage/cards/c/CinderWall.java +++ b/Mage.Sets/src/mage/cards/c/CinderWall.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/c/Cinderbones.java b/Mage.Sets/src/mage/cards/c/Cinderbones.java index 94401bb9ff8..04801154032 100644 --- a/Mage.Sets/src/mage/cards/c/Cinderbones.java +++ b/Mage.Sets/src/mage/cards/c/Cinderbones.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java b/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java index d6c6e13503b..5fd90b51ad6 100644 --- a/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java +++ b/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -35,8 +34,8 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.costs.common.PutCountersSourceCost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CircleOfAffliction.java b/Mage.Sets/src/mage/cards/c/CircleOfAffliction.java index 4b8f61203d7..bd8ff1eac90 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfAffliction.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfAffliction.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; @@ -48,6 +47,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/CircleOfElders.java b/Mage.Sets/src/mage/cards/c/CircleOfElders.java index 9378b27aadb..30d777681ab 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfElders.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfElders.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CircleOfFlame.java b/Mage.Sets/src/mage/cards/c/CircleOfFlame.java index 16984dabb36..0f72384bc53 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfFlame.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -42,6 +41,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java index b836fcfdc6d..b8eb01cde4b 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; @@ -41,6 +39,8 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java index d993b08f1c8..c3addd9792e 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java index 283c938b49d..bed5f45e876 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java index d96e9ec98c3..9b637ce5860 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java index 222460c45ba..b99eaf6fc9c 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java index 67eced4b67d..a3253738098 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java index d1d84a009ef..dfc64dac660 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CircularLogic.java b/Mage.Sets/src/mage/cards/c/CircularLogic.java index 4ec73942b18..052f9834fa3 100644 --- a/Mage.Sets/src/mage/cards/c/CircularLogic.java +++ b/Mage.Sets/src/mage/cards/c/CircularLogic.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.mana.GenericManaCost; @@ -36,6 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.stack.StackObject; diff --git a/Mage.Sets/src/mage/cards/c/CitadelCastellan.java b/Mage.Sets/src/mage/cards/c/CitadelCastellan.java index 517e12d9e17..a15fc4f2838 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelCastellan.java +++ b/Mage.Sets/src/mage/cards/c/CitadelCastellan.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.RenownAbility; +import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java index 8d03fc18e8b..e6a583f9e7f 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java +++ b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbility; @@ -47,6 +45,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author Alexsandr0x diff --git a/Mage.Sets/src/mage/cards/c/CitadelSiege.java b/Mage.Sets/src/mage/cards/c/CitadelSiege.java index 8a8d43d7c35..f8e5d11e7d5 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelSiege.java +++ b/Mage.Sets/src/mage/cards/c/CitadelSiege.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CitanulCentaurs.java b/Mage.Sets/src/mage/cards/c/CitanulCentaurs.java index 9d64542d929..d7cac22ebae 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulCentaurs.java +++ b/Mage.Sets/src/mage/cards/c/CitanulCentaurs.java @@ -28,13 +28,14 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CitanulDruid.java b/Mage.Sets/src/mage/cards/c/CitanulDruid.java index a7f90ee14aa..c42017157f4 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulDruid.java +++ b/Mage.Sets/src/mage/cards/c/CitanulDruid.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -39,6 +38,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterArtifactSpell; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/c/CitanulFlute.java b/Mage.Sets/src/mage/cards/c/CitanulFlute.java index 81504b425a6..13a97caa9fb 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulFlute.java +++ b/Mage.Sets/src/mage/cards/c/CitanulFlute.java @@ -27,21 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -50,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CitanulHierophants.java b/Mage.Sets/src/mage/cards/c/CitanulHierophants.java index 7d56d819728..a88865aa412 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulHierophants.java +++ b/Mage.Sets/src/mage/cards/c/CitanulHierophants.java @@ -27,19 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CitanulWoodreaders.java b/Mage.Sets/src/mage/cards/c/CitanulWoodreaders.java index 1a5828e6e27..df94bee01fa 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulWoodreaders.java +++ b/Mage.Sets/src/mage/cards/c/CitanulWoodreaders.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; @@ -37,6 +35,9 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CityOfBrass.java b/Mage.Sets/src/mage/cards/c/CityOfBrass.java index e11560ec32b..43efa9b5a8f 100644 --- a/Mage.Sets/src/mage/cards/c/CityOfBrass.java +++ b/Mage.Sets/src/mage/cards/c/CityOfBrass.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.BecomesTappedSourceTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CityOfShadows.java b/Mage.Sets/src/mage/cards/c/CityOfShadows.java index 1ef78b5c976..9f93b6c82f7 100644 --- a/Mage.Sets/src/mage/cards/c/CityOfShadows.java +++ b/Mage.Sets/src/mage/cards/c/CityOfShadows.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Luna Skyrise diff --git a/Mage.Sets/src/mage/cards/c/CityOfSolitude.java b/Mage.Sets/src/mage/cards/c/CityOfSolitude.java index 03cef0637f7..9bc0c892a3c 100644 --- a/Mage.Sets/src/mage/cards/c/CityOfSolitude.java +++ b/Mage.Sets/src/mage/cards/c/CityOfSolitude.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CityOfTraitors.java b/Mage.Sets/src/mage/cards/c/CityOfTraitors.java index 4ab9c975d95..fec7287d980 100644 --- a/Mage.Sets/src/mage/cards/c/CityOfTraitors.java +++ b/Mage.Sets/src/mage/cards/c/CityOfTraitors.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Objects; -import java.util.UUID; import mage.Mana; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.common.TapSourceCost; @@ -43,6 +41,9 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.Objects; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CivicGuildmage.java b/Mage.Sets/src/mage/cards/c/CivicGuildmage.java index 4d445a22c09..e066dcb14f6 100644 --- a/Mage.Sets/src/mage/cards/c/CivicGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/CivicGuildmage.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CivicSaber.java b/Mage.Sets/src/mage/cards/c/CivicSaber.java index 560af40380b..c0c275bc9b1 100644 --- a/Mage.Sets/src/mage/cards/c/CivicSaber.java +++ b/Mage.Sets/src/mage/cards/c/CivicSaber.java @@ -37,7 +37,10 @@ import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/c/CivicWayfinder.java b/Mage.Sets/src/mage/cards/c/CivicWayfinder.java index 2ee0ce9464e..15f572ddccc 100644 --- a/Mage.Sets/src/mage/cards/c/CivicWayfinder.java +++ b/Mage.Sets/src/mage/cards/c/CivicWayfinder.java @@ -27,16 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CivilizedScholar.java b/Mage.Sets/src/mage/cards/c/CivilizedScholar.java index ac3986e23a7..b18b64fae2d 100644 --- a/Mage.Sets/src/mage/cards/c/CivilizedScholar.java +++ b/Mage.Sets/src/mage/cards/c/CivilizedScholar.java @@ -27,17 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.h.HomicidalBrute; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.h.HomicidalBrute; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.WatcherScope; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.Watcher; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java index 3b636618f85..9ba1b8c18ed 100644 --- a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java +++ b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,15 +38,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Clairvoyance.java b/Mage.Sets/src/mage/cards/c/Clairvoyance.java index a0dd3dd11f4..482a4f88d64 100644 --- a/Mage.Sets/src/mage/cards/c/Clairvoyance.java +++ b/Mage.Sets/src/mage/cards/c/Clairvoyance.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ClanDefiance.java b/Mage.Sets/src/mage/cards/c/ClanDefiance.java index 89bcc5d269c..bf4bad23c5b 100644 --- a/Mage.Sets/src/mage/cards/c/ClanDefiance.java +++ b/Mage.Sets/src/mage/cards/c/ClanDefiance.java @@ -27,20 +27,21 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ClarionUltimatum.java b/Mage.Sets/src/mage/cards/c/ClarionUltimatum.java index 96ffa996870..617ed24dab1 100644 --- a/Mage.Sets/src/mage/cards/c/ClarionUltimatum.java +++ b/Mage.Sets/src/mage/cards/c/ClarionUltimatum.java @@ -27,11 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -48,6 +43,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.*; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/ClashOfWills.java b/Mage.Sets/src/mage/cards/c/ClashOfWills.java index 07b047c5b10..f20e3229948 100644 --- a/Mage.Sets/src/mage/cards/c/ClashOfWills.java +++ b/Mage.Sets/src/mage/cards/c/ClashOfWills.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Claustrophobia.java b/Mage.Sets/src/mage/cards/c/Claustrophobia.java index 0d833add9f0..821060f81e1 100644 --- a/Mage.Sets/src/mage/cards/c/Claustrophobia.java +++ b/Mage.Sets/src/mage/cards/c/Claustrophobia.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfGix.java b/Mage.Sets/src/mage/cards/c/ClawsOfGix.java index 6a17ffe643d..c03ebdf04a2 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfGix.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfGix.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,9 +34,12 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java index eb1fe024871..368d5037e07 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java @@ -28,11 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; @@ -42,15 +37,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.Outcome; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki, North diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java b/Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java index 46873c21fe3..b2b7a709d34 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfWirewood.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageAllEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ClayStatue.java b/Mage.Sets/src/mage/cards/c/ClayStatue.java index 873163daee5..7c53f8f1d46 100644 --- a/Mage.Sets/src/mage/cards/c/ClayStatue.java +++ b/Mage.Sets/src/mage/cards/c/ClayStatue.java @@ -1,6 +1,5 @@ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -10,6 +9,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Jgod diff --git a/Mage.Sets/src/mage/cards/c/Cleanfall.java b/Mage.Sets/src/mage/cards/c/Cleanfall.java index 989dc7c28fb..246c45f4f0c 100644 --- a/Mage.Sets/src/mage/cards/c/Cleanfall.java +++ b/Mage.Sets/src/mage/cards/c/Cleanfall.java @@ -28,14 +28,14 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterEnchantmentPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/Cleanse.java b/Mage.Sets/src/mage/cards/c/Cleanse.java index 530416393e4..1f32bf6577e 100644 --- a/Mage.Sets/src/mage/cards/c/Cleanse.java +++ b/Mage.Sets/src/mage/cards/c/Cleanse.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CleansingBeam.java b/Mage.Sets/src/mage/cards/c/CleansingBeam.java index f07fdc54df6..25d29c463ef 100644 --- a/Mage.Sets/src/mage/cards/c/CleansingBeam.java +++ b/Mage.Sets/src/mage/cards/c/CleansingBeam.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fenhl diff --git a/Mage.Sets/src/mage/cards/c/CleansingMeditation.java b/Mage.Sets/src/mage/cards/c/CleansingMeditation.java index caa725cdbbd..853e1f099ab 100644 --- a/Mage.Sets/src/mage/cards/c/CleansingMeditation.java +++ b/Mage.Sets/src/mage/cards/c/CleansingMeditation.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/Clear.java b/Mage.Sets/src/mage/cards/c/Clear.java index 296d7dd8d94..15e1cecb256 100644 --- a/Mage.Sets/src/mage/cards/c/Clear.java +++ b/Mage.Sets/src/mage/cards/c/Clear.java @@ -28,15 +28,16 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/ClearAPath.java b/Mage.Sets/src/mage/cards/c/ClearAPath.java index b178feeeab5..9311e116ccd 100644 --- a/Mage.Sets/src/mage/cards/c/ClearAPath.java +++ b/Mage.Sets/src/mage/cards/c/ClearAPath.java @@ -28,17 +28,18 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ClearShot.java b/Mage.Sets/src/mage/cards/c/ClearShot.java index cab3685ca7a..94b5c2ac043 100644 --- a/Mage.Sets/src/mage/cards/c/ClearShot.java +++ b/Mage.Sets/src/mage/cards/c/ClearShot.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageWithPowerTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ClearwaterGoblet.java b/Mage.Sets/src/mage/cards/c/ClearwaterGoblet.java index 58a79539fcf..6205eca2ea8 100644 --- a/Mage.Sets/src/mage/cards/c/ClearwaterGoblet.java +++ b/Mage.Sets/src/mage/cards/c/ClearwaterGoblet.java @@ -27,19 +27,19 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CleaverRiot.java b/Mage.Sets/src/mage/cards/c/CleaverRiot.java index 7eb6fb60fae..549d3db0464 100644 --- a/Mage.Sets/src/mage/cards/c/CleaverRiot.java +++ b/Mage.Sets/src/mage/cards/c/CleaverRiot.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/ClergyEnVec.java b/Mage.Sets/src/mage/cards/c/ClergyEnVec.java index ad733b68e95..84c3d23ae8d 100644 --- a/Mage.Sets/src/mage/cards/c/ClergyEnVec.java +++ b/Mage.Sets/src/mage/cards/c/ClergyEnVec.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +34,13 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java b/Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java index 74fcf82fa60..4710dec0a2a 100644 --- a/Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java +++ b/Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOnlyByOpponentActivatedAbility; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/ClericOfTheForwardOrder.java b/Mage.Sets/src/mage/cards/c/ClericOfTheForwardOrder.java index c9b52178242..52b369e0a6e 100644 --- a/Mage.Sets/src/mage/cards/c/ClericOfTheForwardOrder.java +++ b/Mage.Sets/src/mage/cards/c/ClericOfTheForwardOrder.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CleverImpersonator.java b/Mage.Sets/src/mage/cards/c/CleverImpersonator.java index 36bcc8edd72..5bdb5315758 100644 --- a/Mage.Sets/src/mage/cards/c/CleverImpersonator.java +++ b/Mage.Sets/src/mage/cards/c/CleverImpersonator.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.CopyPermanentEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterNonlandPermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/Clickslither.java b/Mage.Sets/src/mage/cards/c/Clickslither.java index a910715d1fa..60737a36b8f 100644 --- a/Mage.Sets/src/mage/cards/c/Clickslither.java +++ b/Mage.Sets/src/mage/cards/c/Clickslither.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CliffThreader.java b/Mage.Sets/src/mage/cards/c/CliffThreader.java index fafced7b1c3..0f043cc31c8 100644 --- a/Mage.Sets/src/mage/cards/c/CliffThreader.java +++ b/Mage.Sets/src/mage/cards/c/CliffThreader.java @@ -28,12 +28,13 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CliffhavenVampire.java b/Mage.Sets/src/mage/cards/c/CliffhavenVampire.java index 34dda148373..8811c5daf0f 100644 --- a/Mage.Sets/src/mage/cards/c/CliffhavenVampire.java +++ b/Mage.Sets/src/mage/cards/c/CliffhavenVampire.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.GainLifeControllerTriggeredAbility; import mage.abilities.effects.common.LoseLifeOpponentsEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java b/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java index 2143f633b68..d85e673be8e 100644 --- a/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java +++ b/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -40,11 +37,14 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CliffsideLookout.java b/Mage.Sets/src/mage/cards/c/CliffsideLookout.java index 6277e750603..2b3d38bcf13 100644 --- a/Mage.Sets/src/mage/cards/c/CliffsideLookout.java +++ b/Mage.Sets/src/mage/cards/c/CliffsideLookout.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java b/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java index 84cf59a4775..0528415e7cc 100644 --- a/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java +++ b/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java @@ -29,17 +29,17 @@ package mage.cards.c; import mage.abilities.CountType; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.InvertCondition; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/cards/c/ClingingAnemones.java b/Mage.Sets/src/mage/cards/c/ClingingAnemones.java index bd3d1870c54..d3ba465ac46 100644 --- a/Mage.Sets/src/mage/cards/c/ClingingAnemones.java +++ b/Mage.Sets/src/mage/cards/c/ClingingAnemones.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ClingingDarkness.java b/Mage.Sets/src/mage/cards/c/ClingingDarkness.java index 17a84dabba8..6aab619fea1 100644 --- a/Mage.Sets/src/mage/cards/c/ClingingDarkness.java +++ b/Mage.Sets/src/mage/cards/c/ClingingDarkness.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,9 +34,15 @@ 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author anonymous */ diff --git a/Mage.Sets/src/mage/cards/c/ClingingMists.java b/Mage.Sets/src/mage/cards/c/ClingingMists.java index 686382183f1..91c2a5d0074 100644 --- a/Mage.Sets/src/mage/cards/c/ClingingMists.java +++ b/Mage.Sets/src/mage/cards/c/ClingingMists.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -47,6 +44,10 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTargets; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/ClipWings.java b/Mage.Sets/src/mage/cards/c/ClipWings.java index 3ae7bbe913f..c46cc3ce210 100644 --- a/Mage.Sets/src/mage/cards/c/ClipWings.java +++ b/Mage.Sets/src/mage/cards/c/ClipWings.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.SacrificeOpponentsEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CloakAndDagger.java b/Mage.Sets/src/mage/cards/c/CloakAndDagger.java index 428f3da0aa4..f862bf77b06 100644 --- a/Mage.Sets/src/mage/cards/c/CloakAndDagger.java +++ b/Mage.Sets/src/mage/cards/c/CloakAndDagger.java @@ -27,11 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,11 +38,13 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.SetTargetPointer; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CloakOfFeathers.java b/Mage.Sets/src/mage/cards/c/CloakOfFeathers.java index 80ebf538ee2..797509a1c0b 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfFeathers.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfFeathers.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java b/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java index 826c6203345..7172a9e1aa6 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,17 +36,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.PhasingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CloakOfMists.java b/Mage.Sets/src/mage/cards/c/CloakOfMists.java index 569cc16cfa0..31e5ac57e8b 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfMists.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfMists.java @@ -27,20 +27,21 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.combat.CantBeBlockedAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CloakedSiren.java b/Mage.Sets/src/mage/cards/c/CloakedSiren.java index 2a4288b5a38..3f57617fa9d 100644 --- a/Mage.Sets/src/mage/cards/c/CloakedSiren.java +++ b/Mage.Sets/src/mage/cards/c/CloakedSiren.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CloakingDevice.java b/Mage.Sets/src/mage/cards/c/CloakingDevice.java index a5126fcff8a..9ac820e96b8 100644 --- a/Mage.Sets/src/mage/cards/c/CloakingDevice.java +++ b/Mage.Sets/src/mage/cards/c/CloakingDevice.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.AttacksAttachedTriggeredAbility; @@ -50,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/ClockOfOmens.java b/Mage.Sets/src/mage/cards/c/ClockOfOmens.java index ba00058afe7..8b4e9d8844b 100644 --- a/Mage.Sets/src/mage/cards/c/ClockOfOmens.java +++ b/Mage.Sets/src/mage/cards/c/ClockOfOmens.java @@ -27,14 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -42,6 +41,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/Clockspinning.java b/Mage.Sets/src/mage/cards/c/Clockspinning.java index e8aab7e5506..5045695cf8e 100644 --- a/Mage.Sets/src/mage/cards/c/Clockspinning.java +++ b/Mage.Sets/src/mage/cards/c/Clockspinning.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -49,6 +46,10 @@ import mage.players.Player; import mage.target.common.TargetPermanentOrSuspendedCard; import mage.target.targetpointer.FixedTarget; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/ClockworkAvian.java b/Mage.Sets/src/mage/cards/c/ClockworkAvian.java index 3dbea9f0410..7a02839cb6f 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkAvian.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkAvian.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EndOfCombatTriggeredAbility; @@ -54,6 +53,8 @@ import mage.counters.Counters; import mage.game.Game; import mage.watchers.common.AttackedOrBlockedThisCombatWatcher; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/c/ClockworkBeast.java b/Mage.Sets/src/mage/cards/c/ClockworkBeast.java index 0a1c06eaf88..b383685e7d5 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkBeast.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkBeast.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EndOfCombatTriggeredAbility; @@ -53,6 +52,8 @@ import mage.counters.Counters; import mage.game.Game; import mage.watchers.common.AttackedOrBlockedThisCombatWatcher; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/ClockworkBeetle.java b/Mage.Sets/src/mage/cards/c/ClockworkBeetle.java index 02ca0b368d9..b903893bb59 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkBeetle.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkBeetle.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ClockworkCondor.java b/Mage.Sets/src/mage/cards/c/ClockworkCondor.java index 3c84659583d..b4c0851ca93 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkCondor.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkCondor.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -45,6 +44,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ClockworkDragon.java b/Mage.Sets/src/mage/cards/c/ClockworkDragon.java index 93e09a59d23..0c4697ba051 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkDragon.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -48,6 +47,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java b/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java index 8d67b2e128e..4d1948b6022 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author hanasu diff --git a/Mage.Sets/src/mage/cards/c/ClockworkHydra.java b/Mage.Sets/src/mage/cards/c/ClockworkHydra.java index 50a66752573..8eb6d45d8fa 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkHydra.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -51,6 +50,8 @@ import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java b/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java index 38aa0d063f3..14c90d799b8 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -48,6 +47,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CloisteredYouth.java b/Mage.Sets/src/mage/cards/c/CloisteredYouth.java index c9abeabff62..a758eb45d4f 100644 --- a/Mage.Sets/src/mage/cards/c/CloisteredYouth.java +++ b/Mage.Sets/src/mage/cards/c/CloisteredYouth.java @@ -27,18 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.u.UnholyFiend; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.u.UnholyFiend; +import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Clone.java b/Mage.Sets/src/mage/cards/c/Clone.java index a46d26ca679..86731abe95c 100644 --- a/Mage.Sets/src/mage/cards/c/Clone.java +++ b/Mage.Sets/src/mage/cards/c/Clone.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.CopyPermanentEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CloneLegion.java b/Mage.Sets/src/mage/cards/c/CloneLegion.java index 6b7f0433ee3..7a88b5adc19 100644 --- a/Mage.Sets/src/mage/cards/c/CloneLegion.java +++ b/Mage.Sets/src/mage/cards/c/CloneLegion.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect; @@ -42,6 +41,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CloneShell.java b/Mage.Sets/src/mage/cards/c/CloneShell.java index 42b43908a63..7bb753fd25c 100644 --- a/Mage.Sets/src/mage/cards/c/CloneShell.java +++ b/Mage.Sets/src/mage/cards/c/CloneShell.java @@ -27,18 +27,12 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -48,6 +42,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetCard; +import java.util.List; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/c/CloseQuarters.java b/Mage.Sets/src/mage/cards/c/CloseQuarters.java index a6e9a21fcc8..8e8b51ddc2b 100644 --- a/Mage.Sets/src/mage/cards/c/CloseQuarters.java +++ b/Mage.Sets/src/mage/cards/c/CloseQuarters.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedAllTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ClotSliver.java b/Mage.Sets/src/mage/cards/c/ClotSliver.java index 5e54bcba446..b2d87fd0fd1 100644 --- a/Mage.Sets/src/mage/cards/c/ClotSliver.java +++ b/Mage.Sets/src/mage/cards/c/ClotSliver.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,11 +35,14 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CloudCover.java b/Mage.Sets/src/mage/cards/c/CloudCover.java index f75f3cbc227..258a211c8d1 100644 --- a/Mage.Sets/src/mage/cards/c/CloudCover.java +++ b/Mage.Sets/src/mage/cards/c/CloudCover.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CloudCrusader.java b/Mage.Sets/src/mage/cards/c/CloudCrusader.java index 4d72f3ceece..ea78665fd11 100644 --- a/Mage.Sets/src/mage/cards/c/CloudCrusader.java +++ b/Mage.Sets/src/mage/cards/c/CloudCrusader.java @@ -28,13 +28,14 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CloudDjinn.java b/Mage.Sets/src/mage/cards/c/CloudDjinn.java index 16f3854f6a4..53bb51c84ce 100644 --- a/Mage.Sets/src/mage/cards/c/CloudDjinn.java +++ b/Mage.Sets/src/mage/cards/c/CloudDjinn.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CloudDragon.java b/Mage.Sets/src/mage/cards/c/CloudDragon.java index b75e3b1eb62..57e1c7b6029 100644 --- a/Mage.Sets/src/mage/cards/c/CloudDragon.java +++ b/Mage.Sets/src/mage/cards/c/CloudDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/c/CloudElemental.java b/Mage.Sets/src/mage/cards/c/CloudElemental.java index 19c46314bf7..b885c8dc1fe 100644 --- a/Mage.Sets/src/mage/cards/c/CloudElemental.java +++ b/Mage.Sets/src/mage/cards/c/CloudElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CloudKey.java b/Mage.Sets/src/mage/cards/c/CloudKey.java index fdbe0ecb9f7..102b777044a 100644 --- a/Mage.Sets/src/mage/cards/c/CloudKey.java +++ b/Mage.Sets/src/mage/cards/c/CloudKey.java @@ -5,7 +5,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -16,17 +15,15 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.ChoiceImpl; -import mage.constants.CardType; -import mage.constants.CostModificationType; -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.game.stack.Spell; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author nick.myers diff --git a/Mage.Sets/src/mage/cards/c/CloudManta.java b/Mage.Sets/src/mage/cards/c/CloudManta.java index 967d2d1723e..39a8d105e94 100644 --- a/Mage.Sets/src/mage/cards/c/CloudManta.java +++ b/Mage.Sets/src/mage/cards/c/CloudManta.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CloudOfFaeries.java b/Mage.Sets/src/mage/cards/c/CloudOfFaeries.java index b08a50c48de..4a0842b3794 100644 --- a/Mage.Sets/src/mage/cards/c/CloudOfFaeries.java +++ b/Mage.Sets/src/mage/cards/c/CloudOfFaeries.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +35,9 @@ import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CloudPirates.java b/Mage.Sets/src/mage/cards/c/CloudPirates.java index 86d526ea1e5..bd7c4bb0b30 100644 --- a/Mage.Sets/src/mage/cards/c/CloudPirates.java +++ b/Mage.Sets/src/mage/cards/c/CloudPirates.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CloudSpirit.java b/Mage.Sets/src/mage/cards/c/CloudSpirit.java index 7542a6cfca1..7e142c9061f 100644 --- a/Mage.Sets/src/mage/cards/c/CloudSpirit.java +++ b/Mage.Sets/src/mage/cards/c/CloudSpirit.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/c/CloudSprite.java b/Mage.Sets/src/mage/cards/c/CloudSprite.java index 064e14ff460..314879f3636 100644 --- a/Mage.Sets/src/mage/cards/c/CloudSprite.java +++ b/Mage.Sets/src/mage/cards/c/CloudSprite.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Cloudblazer.java b/Mage.Sets/src/mage/cards/c/Cloudblazer.java index 3e7afa3721b..8594dc77e57 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudblazer.java +++ b/Mage.Sets/src/mage/cards/c/Cloudblazer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CloudchaserEagle.java b/Mage.Sets/src/mage/cards/c/CloudchaserEagle.java index 32a2774c640..286e0eff35b 100644 --- a/Mage.Sets/src/mage/cards/c/CloudchaserEagle.java +++ b/Mage.Sets/src/mage/cards/c/CloudchaserEagle.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java b/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java index 68f702b2850..3f3bdab8c38 100644 --- a/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java +++ b/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CloudcrestLake.java b/Mage.Sets/src/mage/cards/c/CloudcrestLake.java index 4b87408b363..c2d8a5f5b7f 100644 --- a/Mage.Sets/src/mage/cards/c/CloudcrestLake.java +++ b/Mage.Sets/src/mage/cards/c/CloudcrestLake.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEffect; import mage.abilities.mana.BlueManaAbility; @@ -37,6 +34,9 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CloudcrownOak.java b/Mage.Sets/src/mage/cards/c/CloudcrownOak.java index e3ff864ca67..ed2faef8655 100644 --- a/Mage.Sets/src/mage/cards/c/CloudcrownOak.java +++ b/Mage.Sets/src/mage/cards/c/CloudcrownOak.java @@ -27,11 +27,11 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CloudfinRaptor.java b/Mage.Sets/src/mage/cards/c/CloudfinRaptor.java index 719aaefce89..24e62f2967b 100644 --- a/Mage.Sets/src/mage/cards/c/CloudfinRaptor.java +++ b/Mage.Sets/src/mage/cards/c/CloudfinRaptor.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Cloudform.java b/Mage.Sets/src/mage/cards/c/Cloudform.java index 1c3061052fc..04cf45d3473 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudform.java +++ b/Mage.Sets/src/mage/cards/c/Cloudform.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesAuraAttachToManifestSourceEffect; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java index 17405decbfc..c312b410f95 100644 --- a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -50,6 +49,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.KithkinToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CloudheathDrake.java b/Mage.Sets/src/mage/cards/c/CloudheathDrake.java index 33b7363cf84..53bdf1f125e 100644 --- a/Mage.Sets/src/mage/cards/c/CloudheathDrake.java +++ b/Mage.Sets/src/mage/cards/c/CloudheathDrake.java @@ -28,11 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.Zone; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +36,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java b/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java index 7c1cab7e9db..2018196354c 100644 --- a/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java +++ b/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -37,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.Game; @@ -45,6 +45,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class CloudhoofKirin extends CardImpl { public CloudhoofKirin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kirin"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/c/Cloudpost.java b/Mage.Sets/src/mage/cards/c/Cloudpost.java index aebf4d3e875..c32e8c56ce2 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudpost.java +++ b/Mage.Sets/src/mage/cards/c/Cloudpost.java @@ -27,17 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java b/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java index e4e235a3214..0bc0acb27c9 100644 --- a/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java +++ b/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/Cloudseeder.java b/Mage.Sets/src/mage/cards/c/Cloudseeder.java index 076bc73c29c..1f15955224b 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudseeder.java +++ b/Mage.Sets/src/mage/cards/c/Cloudseeder.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CanBlockOnlyFlyingAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/Cloudshift.java b/Mage.Sets/src/mage/cards/c/Cloudshift.java index b1119bd4b9a..ce9a998717d 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudshift.java +++ b/Mage.Sets/src/mage/cards/c/Cloudshift.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/c/Cloudskate.java b/Mage.Sets/src/mage/cards/c/Cloudskate.java index 787b202217f..81b1a454693 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudskate.java +++ b/Mage.Sets/src/mage/cards/c/Cloudskate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FadingAbility; import mage.abilities.keyword.FlyingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author markedagain diff --git a/Mage.Sets/src/mage/cards/c/CloudstoneCurio.java b/Mage.Sets/src/mage/cards/c/CloudstoneCurio.java index 31844136695..ff194e0b97e 100644 --- a/Mage.Sets/src/mage/cards/c/CloudstoneCurio.java +++ b/Mage.Sets/src/mage/cards/c/CloudstoneCurio.java @@ -27,19 +27,12 @@ */ package mage.cards.c; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -50,6 +43,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Cloudthresher.java b/Mage.Sets/src/mage/cards/c/Cloudthresher.java index 6452181643b..f40f5b6d675 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudthresher.java +++ b/Mage.Sets/src/mage/cards/c/Cloudthresher.java @@ -27,22 +27,23 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DamagePlayersEffect; -import mage.abilities.keyword.FlashAbility; -import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.EvokeAbility; +import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; +import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java b/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java index cc734762765..cca194cda88 100644 --- a/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java +++ b/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,15 +38,17 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ShroudAbility; -import mage.constants.CardType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AttachmentType; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ClovenCasting.java b/Mage.Sets/src/mage/cards/c/ClovenCasting.java index eea8864f432..27ae85f10a4 100644 --- a/Mage.Sets/src/mage/cards/c/ClovenCasting.java +++ b/Mage.Sets/src/mage/cards/c/ClovenCasting.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.MulticoloredPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ClutchOfCurrents.java b/Mage.Sets/src/mage/cards/c/ClutchOfCurrents.java index 9a0ea6d406f..54e5ac9db1a 100644 --- a/Mage.Sets/src/mage/cards/c/ClutchOfCurrents.java +++ b/Mage.Sets/src/mage/cards/c/ClutchOfCurrents.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.AwakenAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ClutchOfTheUndercity.java b/Mage.Sets/src/mage/cards/c/ClutchOfTheUndercity.java index 7609cecaaf3..0b7784ac6cd 100644 --- a/Mage.Sets/src/mage/cards/c/ClutchOfTheUndercity.java +++ b/Mage.Sets/src/mage/cards/c/ClutchOfTheUndercity.java @@ -27,16 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.LoseLifeTargetControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CoalGolem.java b/Mage.Sets/src/mage/cards/c/CoalGolem.java index dbb9a1e40ab..a6d914452de 100644 --- a/Mage.Sets/src/mage/cards/c/CoalGolem.java +++ b/Mage.Sets/src/mage/cards/c/CoalGolem.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CoalStoker.java b/Mage.Sets/src/mage/cards/c/CoalStoker.java index 8692968bda8..a74b8ad2587 100644 --- a/Mage.Sets/src/mage/cards/c/CoalStoker.java +++ b/Mage.Sets/src/mage/cards/c/CoalStoker.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/c/CoalitionFlag.java b/Mage.Sets/src/mage/cards/c/CoalitionFlag.java index d4edb5ff740..20080703141 100644 --- a/Mage.Sets/src/mage/cards/c/CoalitionFlag.java +++ b/Mage.Sets/src/mage/cards/c/CoalitionFlag.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -36,15 +35,13 @@ import mage.abilities.effects.common.ruleModifying.TargetsHaveToTargetPermanentI import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoalitionHonorGuard.java b/Mage.Sets/src/mage/cards/c/CoalitionHonorGuard.java index 26721d9951d..bd20e61a0b2 100644 --- a/Mage.Sets/src/mage/cards/c/CoalitionHonorGuard.java +++ b/Mage.Sets/src/mage/cards/c/CoalitionHonorGuard.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.ruleModifying.TargetsHaveToTargetPermanentIfAbleEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * Cardname: Coalition Honor Guard * diff --git a/Mage.Sets/src/mage/cards/c/CoalitionRelic.java b/Mage.Sets/src/mage/cards/c/CoalitionRelic.java index b9ae1581139..a127b10e996 100644 --- a/Mage.Sets/src/mage/cards/c/CoalitionRelic.java +++ b/Mage.Sets/src/mage/cards/c/CoalitionRelic.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.BeginningOfPreCombatMainTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoalitionVictory.java b/Mage.Sets/src/mage/cards/c/CoalitionVictory.java index 0bcffaf98d3..625cb91e0dd 100644 --- a/Mage.Sets/src/mage/cards/c/CoalitionVictory.java +++ b/Mage.Sets/src/mage/cards/c/CoalitionVictory.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.condition.Condition; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CoastWatcher.java b/Mage.Sets/src/mage/cards/c/CoastWatcher.java index 713fa18c765..ad170175350 100644 --- a/Mage.Sets/src/mage/cards/c/CoastWatcher.java +++ b/Mage.Sets/src/mage/cards/c/CoastWatcher.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CoastalBreach.java b/Mage.Sets/src/mage/cards/c/CoastalBreach.java index f2515fc2310..3833d056c4d 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalBreach.java +++ b/Mage.Sets/src/mage/cards/c/CoastalBreach.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect; import mage.abilities.keyword.UndauntedAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoastalDiscovery.java b/Mage.Sets/src/mage/cards/c/CoastalDiscovery.java index 99883d794ec..cce4a96490c 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalDiscovery.java +++ b/Mage.Sets/src/mage/cards/c/CoastalDiscovery.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.AwakenAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CoastalDrake.java b/Mage.Sets/src/mage/cards/c/CoastalDrake.java index 1acffa9bb05..80e6181c763 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalDrake.java +++ b/Mage.Sets/src/mage/cards/c/CoastalDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java b/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java index 09992b1ddb7..ab64a15be09 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java +++ b/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,12 +34,15 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CoastalPiracy.java b/Mage.Sets/src/mage/cards/c/CoastalPiracy.java index f9bbec209ee..d278dd3ff7e 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalPiracy.java +++ b/Mage.Sets/src/mage/cards/c/CoastalPiracy.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Xavierv3131 diff --git a/Mage.Sets/src/mage/cards/c/CoastalTower.java b/Mage.Sets/src/mage/cards/c/CoastalTower.java index 814a14f8ef8..7e420a9e650 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalTower.java +++ b/Mage.Sets/src/mage/cards/c/CoastalTower.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CoastalWizard.java b/Mage.Sets/src/mage/cards/c/CoastalWizard.java index ed493efad4f..c683fec4815 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalWizard.java +++ b/Mage.Sets/src/mage/cards/c/CoastalWizard.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CoastlineChimera.java b/Mage.Sets/src/mage/cards/c/CoastlineChimera.java index b8a06e49f86..e6d825b72e8 100644 --- a/Mage.Sets/src/mage/cards/c/CoastlineChimera.java +++ b/Mage.Sets/src/mage/cards/c/CoastlineChimera.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoatOfArms.java b/Mage.Sets/src/mage/cards/c/CoatOfArms.java index 515048f64e2..fea7421fcee 100644 --- a/Mage.Sets/src/mage/cards/c/CoatOfArms.java +++ b/Mage.Sets/src/mage/cards/c/CoatOfArms.java @@ -27,25 +27,21 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.CardUtil; +import java.util.List; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CoatWithVenom.java b/Mage.Sets/src/mage/cards/c/CoatWithVenom.java index 854f068245c..118ee78cd89 100644 --- a/Mage.Sets/src/mage/cards/c/CoatWithVenom.java +++ b/Mage.Sets/src/mage/cards/c/CoatWithVenom.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java b/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java index baafd7e331d..b6bd03c3bd5 100644 --- a/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java +++ b/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.WishEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CobaltGolem.java b/Mage.Sets/src/mage/cards/c/CobaltGolem.java index 01152d17ad5..e9616755f9a 100644 --- a/Mage.Sets/src/mage/cards/c/CobaltGolem.java +++ b/Mage.Sets/src/mage/cards/c/CobaltGolem.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Cobblebrute.java b/Mage.Sets/src/mage/cards/c/Cobblebrute.java index b58afffeba1..dfd6294f6c7 100644 --- a/Mage.Sets/src/mage/cards/c/Cobblebrute.java +++ b/Mage.Sets/src/mage/cards/c/Cobblebrute.java @@ -28,11 +28,12 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CobbledWings.java b/Mage.Sets/src/mage/cards/c/CobbledWings.java index 74a815ff424..cdf347ee2a4 100644 --- a/Mage.Sets/src/mage/cards/c/CobbledWings.java +++ b/Mage.Sets/src/mage/cards/c/CobbledWings.java @@ -27,12 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -40,6 +34,12 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CobraTrap.java b/Mage.Sets/src/mage/cards/c/CobraTrap.java index fa858a096e5..ce895f6bdb1 100644 --- a/Mage.Sets/src/mage/cards/c/CobraTrap.java +++ b/Mage.Sets/src/mage/cards/c/CobraTrap.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; @@ -47,6 +44,10 @@ import mage.game.permanent.token.SnakeToken; import mage.game.stack.StackObject; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author Rafbill diff --git a/Mage.Sets/src/mage/cards/c/Cockatrice.java b/Mage.Sets/src/mage/cards/c/Cockatrice.java index d5e5e86e94d..41b24157063 100644 --- a/Mage.Sets/src/mage/cards/c/Cockatrice.java +++ b/Mage.Sets/src/mage/cards/c/Cockatrice.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CodexShredder.java b/Mage.Sets/src/mage/cards/c/CodexShredder.java index 56adbb5e7de..455819352ca 100644 --- a/Mage.Sets/src/mage/cards/c/CodexShredder.java +++ b/Mage.Sets/src/mage/cards/c/CodexShredder.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * @author LevelX2 */ diff --git a/Mage.Sets/src/mage/cards/c/CoercedConfession.java b/Mage.Sets/src/mage/cards/c/CoercedConfession.java index a35e813179c..962fa5e7ab1 100644 --- a/Mage.Sets/src/mage/cards/c/CoercedConfession.java +++ b/Mage.Sets/src/mage/cards/c/CoercedConfession.java @@ -27,22 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Coercion.java b/Mage.Sets/src/mage/cards/c/Coercion.java index f646d32aa14..8815c6e96d7 100644 --- a/Mage.Sets/src/mage/cards/c/Coercion.java +++ b/Mage.Sets/src/mage/cards/c/Coercion.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CoercivePortal.java b/Mage.Sets/src/mage/cards/c/CoercivePortal.java index fb508f989f8..52db99d9039 100644 --- a/Mage.Sets/src/mage/cards/c/CoercivePortal.java +++ b/Mage.Sets/src/mage/cards/c/CoercivePortal.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CoffinPurge.java b/Mage.Sets/src/mage/cards/c/CoffinPurge.java index bfdf3c82faf..d1309764dd5 100644 --- a/Mage.Sets/src/mage/cards/c/CoffinPurge.java +++ b/Mage.Sets/src/mage/cards/c/CoffinPurge.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author cbt33, jonubuu (Withered Wretch) diff --git a/Mage.Sets/src/mage/cards/c/CoffinQueen.java b/Mage.Sets/src/mage/cards/c/CoffinQueen.java index b51adf9b8d2..d896a2a69d9 100644 --- a/Mage.Sets/src/mage/cards/c/CoffinQueen.java +++ b/Mage.Sets/src/mage/cards/c/CoffinQueen.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -52,6 +51,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCardInGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/Cognivore.java b/Mage.Sets/src/mage/cards/c/Cognivore.java index e9cd73bd61b..518ea6abe05 100644 --- a/Mage.Sets/src/mage/cards/c/Cognivore.java +++ b/Mage.Sets/src/mage/cards/c/Cognivore.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CogworkAssembler.java b/Mage.Sets/src/mage/cards/c/CogworkAssembler.java index 0432779b8ba..c8ccf8ae782 100644 --- a/Mage.Sets/src/mage/cards/c/CogworkAssembler.java +++ b/Mage.Sets/src/mage/cards/c/CogworkAssembler.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetArtifactPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java b/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java index 4f7fd74e96e..eea00b19660 100644 --- a/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.ServoToken; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CoiledTinviper.java b/Mage.Sets/src/mage/cards/c/CoiledTinviper.java index 1f7a0559f40..757ebb1648d 100644 --- a/Mage.Sets/src/mage/cards/c/CoiledTinviper.java +++ b/Mage.Sets/src/mage/cards/c/CoiledTinviper.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CoilingOracle.java b/Mage.Sets/src/mage/cards/c/CoilingOracle.java index 322db21d7fc..b355acf8c4a 100644 --- a/Mage.Sets/src/mage/cards/c/CoilingOracle.java +++ b/Mage.Sets/src/mage/cards/c/CoilingOracle.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.RevealTopLandToBattlefieldElseHandEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * @author mluds */ diff --git a/Mage.Sets/src/mage/cards/c/ColdEyedSelkie.java b/Mage.Sets/src/mage/cards/c/ColdEyedSelkie.java index 3c3fe6b837b..5e512246365 100644 --- a/Mage.Sets/src/mage/cards/c/ColdEyedSelkie.java +++ b/Mage.Sets/src/mage/cards/c/ColdEyedSelkie.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ColdSnap.java b/Mage.Sets/src/mage/cards/c/ColdSnap.java index ce5e5115ee9..d238f874c47 100644 --- a/Mage.Sets/src/mage/cards/c/ColdSnap.java +++ b/Mage.Sets/src/mage/cards/c/ColdSnap.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ColdStorage.java b/Mage.Sets/src/mage/cards/c/ColdStorage.java index fb88c2c72b6..28494580620 100644 --- a/Mage.Sets/src/mage/cards/c/ColdStorage.java +++ b/Mage.Sets/src/mage/cards/c/ColdStorage.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ColdsteelHeart.java b/Mage.Sets/src/mage/cards/c/ColdsteelHeart.java index 4e59c9eb3ad..283769d5dfb 100644 --- a/Mage.Sets/src/mage/cards/c/ColdsteelHeart.java +++ b/Mage.Sets/src/mage/cards/c/ColdsteelHeart.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,13 +38,12 @@ import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman @@ -54,7 +52,7 @@ public class ColdsteelHeart extends CardImpl { public ColdsteelHeart(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - this.supertype.add("Snow"); + this.addSuperType(SuperType.SNOW); // Coldsteel Heart enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java b/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java index d1fd6e37a19..5d8a3be932d 100644 --- a/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java +++ b/Mage.Sets/src/mage/cards/c/ColfenorsPlans.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,17 +38,14 @@ import mage.abilities.effects.common.continuous.CantCastMoreThanOneSpellEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.ExileZone; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/ColfenorsUrn.java b/Mage.Sets/src/mage/cards/c/ColfenorsUrn.java index 0c477bc253c..fe024db100c 100644 --- a/Mage.Sets/src/mage/cards/c/ColfenorsUrn.java +++ b/Mage.Sets/src/mage/cards/c/ColfenorsUrn.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -50,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/CollapsingBorders.java b/Mage.Sets/src/mage/cards/c/CollapsingBorders.java index b99b7dfd7fa..5086cf77b23 100644 --- a/Mage.Sets/src/mage/cards/c/CollapsingBorders.java +++ b/Mage.Sets/src/mage/cards/c/CollapsingBorders.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.DomainValue; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CollateralDamage.java b/Mage.Sets/src/mage/cards/c/CollateralDamage.java index 351f61d63c4..ba1c3eea69f 100644 --- a/Mage.Sets/src/mage/cards/c/CollateralDamage.java +++ b/Mage.Sets/src/mage/cards/c/CollateralDamage.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CollectedCompany.java b/Mage.Sets/src/mage/cards/c/CollectedCompany.java index d48828e2d8b..ef2b4f9e738 100644 --- a/Mage.Sets/src/mage/cards/c/CollectedCompany.java +++ b/Mage.Sets/src/mage/cards/c/CollectedCompany.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CollectiveBlessing.java b/Mage.Sets/src/mage/cards/c/CollectiveBlessing.java index 4ba7440be6c..4c189b81ee3 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveBlessing.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveBlessing.java @@ -27,15 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java b/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java index 26e78211ab8..3d9715f2a2c 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.costs.Cost; import mage.abilities.costs.common.DiscardCardCost; @@ -51,6 +50,8 @@ import mage.filter.predicate.other.PlayerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java index 9316190a893..7eb47ab014f 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.mana.GenericManaCost; @@ -49,6 +48,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CollectiveEffort.java b/Mage.Sets/src/mage/cards/c/CollectiveEffort.java index 8df3f87cde7..45acdd4abbd 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveEffort.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveEffort.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.Cost; @@ -57,6 +56,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CollectiveRestraint.java b/Mage.Sets/src/mage/cards/c/CollectiveRestraint.java index a956c845950..45fc31eb50f 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveRestraint.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveRestraint.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCosts; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author Simown diff --git a/Mage.Sets/src/mage/cards/c/CollectiveUnconscious.java b/Mage.Sets/src/mage/cards/c/CollectiveUnconscious.java index 4d73d5deb03..2fa19c54756 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveUnconscious.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveUnconscious.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CollectiveVoyage.java b/Mage.Sets/src/mage/cards/c/CollectiveVoyage.java index 2b2e75acdde..d3d4ce30d9b 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveVoyage.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveVoyage.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; @@ -44,6 +42,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ColosYearling.java b/Mage.Sets/src/mage/cards/c/ColosYearling.java index a9dc44558d5..6ee6640ebae 100644 --- a/Mage.Sets/src/mage/cards/c/ColosYearling.java +++ b/Mage.Sets/src/mage/cards/c/ColosYearling.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ColossalHeroics.java b/Mage.Sets/src/mage/cards/c/ColossalHeroics.java index bcad9fda9e0..3d3375c462b 100644 --- a/Mage.Sets/src/mage/cards/c/ColossalHeroics.java +++ b/Mage.Sets/src/mage/cards/c/ColossalHeroics.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.abilityword.StriveAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ColossalMight.java b/Mage.Sets/src/mage/cards/c/ColossalMight.java index 2d11f4695d3..e2fe7e42a4f 100644 --- a/Mage.Sets/src/mage/cards/c/ColossalMight.java +++ b/Mage.Sets/src/mage/cards/c/ColossalMight.java @@ -28,16 +28,17 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ColossalWhale.java b/Mage.Sets/src/mage/cards/c/ColossalWhale.java index 69e32b2c6a9..f2eceb098de 100644 --- a/Mage.Sets/src/mage/cards/c/ColossalWhale.java +++ b/Mage.Sets/src/mage/cards/c/ColossalWhale.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -50,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ColossodonYearling.java b/Mage.Sets/src/mage/cards/c/ColossodonYearling.java index 5b2c30505a7..8148fa4073c 100644 --- a/Mage.Sets/src/mage/cards/c/ColossodonYearling.java +++ b/Mage.Sets/src/mage/cards/c/ColossodonYearling.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java b/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java index a1dccd72bb3..9d7378d8bd8 100644 --- a/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java +++ b/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java b/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java index 7622ba2544f..d23acbe5c99 100644 --- a/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java +++ b/Mage.Sets/src/mage/cards/c/ColossusOfSardia.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.IsStepCondition; @@ -41,7 +37,11 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.PhaseStep; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ComaVeil.java b/Mage.Sets/src/mage/cards/c/ComaVeil.java index c22d198aaac..0ea155892e5 100644 --- a/Mage.Sets/src/mage/cards/c/ComaVeil.java +++ b/Mage.Sets/src/mage/cards/c/ComaVeil.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CombatMedic.java b/Mage.Sets/src/mage/cards/c/CombatMedic.java index f6e0dcb23b1..32b9241dea1 100644 --- a/Mage.Sets/src/mage/cards/c/CombatMedic.java +++ b/Mage.Sets/src/mage/cards/c/CombatMedic.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/Combust.java b/Mage.Sets/src/mage/cards/c/Combust.java index cab1cdd8209..2d90e0dba06 100644 --- a/Mage.Sets/src/mage/cards/c/Combust.java +++ b/Mage.Sets/src/mage/cards/c/Combust.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -38,11 +35,15 @@ import mage.abilities.effects.common.CantBeCounteredSourceEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java b/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java index 9ea0f7704cd..b6c26493114 100644 --- a/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java +++ b/Mage.Sets/src/mage/cards/c/CombustibleGearhulk.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -47,6 +45,9 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetOpponent; +import java.util.Set; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/Comeuppance.java b/Mage.Sets/src/mage/cards/c/Comeuppance.java index be574ee5075..35c647fca89 100644 --- a/Mage.Sets/src/mage/cards/c/Comeuppance.java +++ b/Mage.Sets/src/mage/cards/c/Comeuppance.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectData; @@ -45,6 +44,8 @@ import mage.game.stack.StackObject; import mage.players.Player; import org.apache.log4j.Logger; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CommandBeacon.java b/Mage.Sets/src/mage/cards/c/CommandBeacon.java index 937c10f2036..3284d69c109 100644 --- a/Mage.Sets/src/mage/cards/c/CommandBeacon.java +++ b/Mage.Sets/src/mage/cards/c/CommandBeacon.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -45,6 +42,10 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CommandTower.java b/Mage.Sets/src/mage/cards/c/CommandTower.java index 6d254aa0216..751d00f2910 100644 --- a/Mage.Sets/src/mage/cards/c/CommandTower.java +++ b/Mage.Sets/src/mage/cards/c/CommandTower.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.mana.CommanderColorIdentityManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Commandeer.java b/Mage.Sets/src/mage/cards/c/Commandeer.java index c0f7140d1e4..775f9bdf0bb 100644 --- a/Mage.Sets/src/mage/cards/c/Commandeer.java +++ b/Mage.Sets/src/mage/cards/c/Commandeer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostSourceAbility; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CommanderCody.java b/Mage.Sets/src/mage/cards/c/CommanderCody.java index adeae9a96dc..a405deb48d1 100644 --- a/Mage.Sets/src/mage/cards/c/CommanderCody.java +++ b/Mage.Sets/src/mage/cards/c/CommanderCody.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -35,16 +34,15 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.TrooperToken; +import java.util.UUID; + /** * * @author Styxo @@ -60,7 +58,7 @@ public class CommanderCody extends CardImpl { public CommanderCody(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Trooper"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/c/CommanderEesha.java b/Mage.Sets/src/mage/cards/c/CommanderEesha.java index 137f2860729..fec71f174b2 100644 --- a/Mage.Sets/src/mage/cards/c/CommanderEesha.java +++ b/Mage.Sets/src/mage/cards/c/CommanderEesha.java @@ -27,16 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author daagar @@ -51,7 +53,7 @@ public class CommanderEesha extends CardImpl { public CommanderEesha(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Bird"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CommanderGrevenIlVec.java b/Mage.Sets/src/mage/cards/c/CommanderGrevenIlVec.java index c3dfcb9048a..17de7ace532 100644 --- a/Mage.Sets/src/mage/cards/c/CommanderGrevenIlVec.java +++ b/Mage.Sets/src/mage/cards/c/CommanderGrevenIlVec.java @@ -27,16 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.SacrificeControllerEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -45,7 +47,7 @@ public class CommanderGrevenIlVec extends CardImpl { public CommanderGrevenIlVec(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/c/CommandersAuthority.java b/Mage.Sets/src/mage/cards/c/CommandersAuthority.java index 71e99db802a..b4e4ee20f41 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersAuthority.java +++ b/Mage.Sets/src/mage/cards/c/CommandersAuthority.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -37,15 +36,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.permanent.token.HumanToken; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CommandersSphere.java b/Mage.Sets/src/mage/cards/c/CommandersSphere.java index bd3edc04d72..ba60505a7d8 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersSphere.java +++ b/Mage.Sets/src/mage/cards/c/CommandersSphere.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CommencementOfFestivities.java b/Mage.Sets/src/mage/cards/c/CommencementOfFestivities.java index 8f26e84435c..35041b152a1 100644 --- a/Mage.Sets/src/mage/cards/c/CommencementOfFestivities.java +++ b/Mage.Sets/src/mage/cards/c/CommencementOfFestivities.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.PreventAllDamageToPlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/CommonBond.java b/Mage.Sets/src/mage/cards/c/CommonBond.java index bbb2f1887f5..552f719eb3c 100644 --- a/Mage.Sets/src/mage/cards/c/CommonBond.java +++ b/Mage.Sets/src/mage/cards/c/CommonBond.java @@ -27,13 +27,11 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -41,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithLava.java b/Mage.Sets/src/mage/cards/c/CommuneWithLava.java index ec9d0215ab4..a5cbc6c9368 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithLava.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithLava.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.ContinuousEffect; @@ -36,16 +34,15 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.PhaseStep; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.Set; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithNature.java b/Mage.Sets/src/mage/cards/c/CommuneWithNature.java index a65f834f6a5..828348dfbab 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithNature.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithNature.java @@ -28,15 +28,16 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java b/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java index 5ed4597f54e..f0e5425689f 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java @@ -27,15 +27,10 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -46,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ComparativeAnalysis.java b/Mage.Sets/src/mage/cards/c/ComparativeAnalysis.java index e7bd8871a39..9b812b4f1fd 100644 --- a/Mage.Sets/src/mage/cards/c/ComparativeAnalysis.java +++ b/Mage.Sets/src/mage/cards/c/ComparativeAnalysis.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.keyword.SurgeAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CompellingDeterrence.java b/Mage.Sets/src/mage/cards/c/CompellingDeterrence.java index bc0e5dd671f..92f39b93d9f 100644 --- a/Mage.Sets/src/mage/cards/c/CompellingDeterrence.java +++ b/Mage.Sets/src/mage/cards/c/CompellingDeterrence.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CompleteDisregard.java b/Mage.Sets/src/mage/cards/c/CompleteDisregard.java index f083f4265c5..83b5a62f861 100644 --- a/Mage.Sets/src/mage/cards/c/CompleteDisregard.java +++ b/Mage.Sets/src/mage/cards/c/CompleteDisregard.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.DevoidAbility; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Complicate.java b/Mage.Sets/src/mage/cards/c/Complicate.java index 86c96e8b047..73c1df6f87d 100644 --- a/Mage.Sets/src/mage/cards/c/Complicate.java +++ b/Mage.Sets/src/mage/cards/c/Complicate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CompositeGolem.java b/Mage.Sets/src/mage/cards/c/CompositeGolem.java index 4e16b589a1f..0b00508c60e 100644 --- a/Mage.Sets/src/mage/cards/c/CompositeGolem.java +++ b/Mage.Sets/src/mage/cards/c/CompositeGolem.java @@ -27,17 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Compost.java b/Mage.Sets/src/mage/cards/c/Compost.java index 3c1ea933b66..0fb5dca2ab2 100644 --- a/Mage.Sets/src/mage/cards/c/Compost.java +++ b/Mage.Sets/src/mage/cards/c/Compost.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/Compulsion.java b/Mage.Sets/src/mage/cards/c/Compulsion.java index 43ce6511a46..178d28c4463 100644 --- a/Mage.Sets/src/mage/cards/c/Compulsion.java +++ b/Mage.Sets/src/mage/cards/c/Compulsion.java @@ -27,19 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.filter.FilterCard; -import mage.target.common.TargetCardInHand; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import mage.filter.FilterCard; +import mage.target.common.TargetCardInHand; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CompulsiveResearch.java b/Mage.Sets/src/mage/cards/c/CompulsiveResearch.java index 9174b7fd781..c15e9c3ea73 100644 --- a/Mage.Sets/src/mage/cards/c/CompulsiveResearch.java +++ b/Mage.Sets/src/mage/cards/c/CompulsiveResearch.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardTargetEffect; @@ -41,6 +40,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetDiscard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ConcealedCourtyard.java b/Mage.Sets/src/mage/cards/c/ConcealedCourtyard.java index 15c75d8f48a..a0e2e4a65b5 100644 --- a/Mage.Sets/src/mage/cards/c/ConcealedCourtyard.java +++ b/Mage.Sets/src/mage/cards/c/ConcealedCourtyard.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -43,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Concentrate.java b/Mage.Sets/src/mage/cards/c/Concentrate.java index 803b9da2abd..670ff2d4cad 100644 --- a/Mage.Sets/src/mage/cards/c/Concentrate.java +++ b/Mage.Sets/src/mage/cards/c/Concentrate.java @@ -27,11 +27,12 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ConcertedEffort.java b/Mage.Sets/src/mage/cards/c/ConcertedEffort.java index e18ba6a8001..7156d294812 100644 --- a/Mage.Sets/src/mage/cards/c/ConcertedEffort.java +++ b/Mage.Sets/src/mage/cards/c/ConcertedEffort.java @@ -27,19 +27,11 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; -import mage.abilities.keyword.DoubleStrikeAbility; -import mage.abilities.keyword.FearAbility; -import mage.abilities.keyword.FirstStrikeAbility; -import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.LandwalkAbility; -import mage.abilities.keyword.ProtectionAbility; -import mage.abilities.keyword.TrampleAbility; -import mage.abilities.keyword.VigilanceAbility; +import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -51,6 +43,8 @@ import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/ConchHorn.java b/Mage.Sets/src/mage/cards/c/ConchHorn.java index ab425ff1c6e..7b9e5f964fd 100644 --- a/Mage.Sets/src/mage/cards/c/ConchHorn.java +++ b/Mage.Sets/src/mage/cards/c/ConchHorn.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ConclaveEquenaut.java b/Mage.Sets/src/mage/cards/c/ConclaveEquenaut.java index 2a2bed1fb22..0d1635ae46f 100644 --- a/Mage.Sets/src/mage/cards/c/ConclaveEquenaut.java +++ b/Mage.Sets/src/mage/cards/c/ConclaveEquenaut.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ConclaveNaturalists.java b/Mage.Sets/src/mage/cards/c/ConclaveNaturalists.java index c6633b55c56..eecd1ae3a52 100644 --- a/Mage.Sets/src/mage/cards/c/ConclaveNaturalists.java +++ b/Mage.Sets/src/mage/cards/c/ConclaveNaturalists.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/ConclavePhalanx.java b/Mage.Sets/src/mage/cards/c/ConclavePhalanx.java index 811115c0c54..88b1af4a374 100644 --- a/Mage.Sets/src/mage/cards/c/ConclavePhalanx.java +++ b/Mage.Sets/src/mage/cards/c/ConclavePhalanx.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java b/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java index ca0d42bebba..00958b1b4d6 100644 --- a/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java +++ b/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java @@ -27,22 +27,25 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; +import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherEnchantedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; -import mage.abilities.dynamicvalue.common.StaticValue; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java b/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java index 01d88af5354..0dd6f6275f2 100644 --- a/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java +++ b/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.HasteAbility; @@ -35,9 +34,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -46,7 +48,7 @@ public class ConcordantCrossroads extends CardImpl { public ConcordantCrossroads(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // All creatures have haste. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/c/ConcordiaPegasus.java b/Mage.Sets/src/mage/cards/c/ConcordiaPegasus.java index 99c3089b701..58720789de8 100644 --- a/Mage.Sets/src/mage/cards/c/ConcordiaPegasus.java +++ b/Mage.Sets/src/mage/cards/c/ConcordiaPegasus.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ConcussiveBolt.java b/Mage.Sets/src/mage/cards/c/ConcussiveBolt.java index 681f12932a0..bacd1715cb8 100644 --- a/Mage.Sets/src/mage/cards/c/ConcussiveBolt.java +++ b/Mage.Sets/src/mage/cards/c/ConcussiveBolt.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.effects.OneShotEffect; @@ -38,10 +34,15 @@ import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/Condemn.java b/Mage.Sets/src/mage/cards/c/Condemn.java index 1934f791030..d0817ddf550 100644 --- a/Mage.Sets/src/mage/cards/c/Condemn.java +++ b/Mage.Sets/src/mage/cards/c/Condemn.java @@ -28,7 +28,6 @@ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/Condescend.java b/Mage.Sets/src/mage/cards/c/Condescend.java index 77f233d95d1..69af6351423 100644 --- a/Mage.Sets/src/mage/cards/c/Condescend.java +++ b/Mage.Sets/src/mage/cards/c/Condescend.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfEmrakul.java b/Mage.Sets/src/mage/cards/c/ConduitOfEmrakul.java index 0edb9d0e101..09c45a60895 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfEmrakul.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfEmrakul.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.common.AttacksTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java index 1c152d5c9ea..a485dfe2eb4 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -54,6 +51,10 @@ import mage.game.stack.Spell; import mage.target.common.TargetCardInLibrary; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java b/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java index 21dc6e752ab..d8718228e72 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.common.AttacksTriggeredAbility; @@ -45,6 +44,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConeOfFlame.java b/Mage.Sets/src/mage/cards/c/ConeOfFlame.java index ed36dec16a0..64b2682afb6 100644 --- a/Mage.Sets/src/mage/cards/c/ConeOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/ConeOfFlame.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -42,6 +41,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/c/Confessor.java b/Mage.Sets/src/mage/cards/c/Confessor.java index 759f18be1b4..d15962c2d35 100644 --- a/Mage.Sets/src/mage/cards/c/Confessor.java +++ b/Mage.Sets/src/mage/cards/c/Confessor.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/ConfirmSuspicions.java b/Mage.Sets/src/mage/cards/c/ConfirmSuspicions.java index 18cd077b4f4..86c4d9939e5 100644 --- a/Mage.Sets/src/mage/cards/c/ConfirmSuspicions.java +++ b/Mage.Sets/src/mage/cards/c/ConfirmSuspicions.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.keyword.InvestigateEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Confiscate.java b/Mage.Sets/src/mage/cards/c/Confiscate.java index 8a2d8c9a6df..eee25a3585f 100644 --- a/Mage.Sets/src/mage/cards/c/Confiscate.java +++ b/Mage.Sets/src/mage/cards/c/Confiscate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.continuous.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; diff --git a/Mage.Sets/src/mage/cards/c/Conflagrate.java b/Mage.Sets/src/mage/cards/c/Conflagrate.java index 46f7bd37a04..732dd120e20 100644 --- a/Mage.Sets/src/mage/cards/c/Conflagrate.java +++ b/Mage.Sets/src/mage/cards/c/Conflagrate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.DiscardTargetCost; @@ -45,6 +44,8 @@ import mage.filter.FilterCard; import mage.game.Game; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Conflux.java b/Mage.Sets/src/mage/cards/c/Conflux.java index c0e81212ca4..fa5be72383b 100644 --- a/Mage.Sets/src/mage/cards/c/Conflux.java +++ b/Mage.Sets/src/mage/cards/c/Conflux.java @@ -27,16 +27,10 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -46,6 +40,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/Confound.java b/Mage.Sets/src/mage/cards/c/Confound.java index 38575e88dc4..f7f4033a0cb 100644 --- a/Mage.Sets/src/mage/cards/c/Confound.java +++ b/Mage.Sets/src/mage/cards/c/Confound.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.TargetsPermanentPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java b/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java index 722ac02f00c..ee87e137c2e 100644 --- a/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java +++ b/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConfusionInTheRanks.java b/Mage.Sets/src/mage/cards/c/ConfusionInTheRanks.java index 9ce9bb67b4d..7fc0ca4b111 100644 --- a/Mage.Sets/src/mage/cards/c/ConfusionInTheRanks.java +++ b/Mage.Sets/src/mage/cards/c/ConfusionInTheRanks.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.Effect; @@ -48,6 +45,10 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/Congregate.java b/Mage.Sets/src/mage/cards/c/Congregate.java index 124f29a8422..0fa06a60da9 100644 --- a/Mage.Sets/src/mage/cards/c/Congregate.java +++ b/Mage.Sets/src/mage/cards/c/Congregate.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java b/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java index 596c2ff2504..12644785a8d 100644 --- a/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java +++ b/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java @@ -27,16 +27,10 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -47,6 +41,9 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConiferStrider.java b/Mage.Sets/src/mage/cards/c/ConiferStrider.java index f2f672e8934..9ed7275b472 100644 --- a/Mage.Sets/src/mage/cards/c/ConiferStrider.java +++ b/Mage.Sets/src/mage/cards/c/ConiferStrider.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java b/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java index d2302346317..0677b79b88d 100644 --- a/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java +++ b/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java @@ -27,14 +27,12 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.continuous.ExchangeControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterPermanent; @@ -42,6 +40,8 @@ import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author LevelX2 */ diff --git a/Mage.Sets/src/mage/cards/c/ConjurersBauble.java b/Mage.Sets/src/mage/cards/c/ConjurersBauble.java index 0352fab974d..2df9a33e555 100644 --- a/Mage.Sets/src/mage/cards/c/ConjurersBauble.java +++ b/Mage.Sets/src/mage/cards/c/ConjurersBauble.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,11 +35,15 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ConjurersCloset.java b/Mage.Sets/src/mage/cards/c/ConjurersCloset.java index eb4159e81d5..e96f6729e86 100644 --- a/Mage.Sets/src/mage/cards/c/ConjurersCloset.java +++ b/Mage.Sets/src/mage/cards/c/ConjurersCloset.java @@ -27,13 +27,13 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/Conquer.java b/Mage.Sets/src/mage/cards/c/Conquer.java index 1da4a1fd335..59d9a829307 100644 --- a/Mage.Sets/src/mage/cards/c/Conquer.java +++ b/Mage.Sets/src/mage/cards/c/Conquer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/c/ConqueringManticore.java b/Mage.Sets/src/mage/cards/c/ConqueringManticore.java index 712a9e7f9c0..9adda9249fd 100644 --- a/Mage.Sets/src/mage/cards/c/ConqueringManticore.java +++ b/Mage.Sets/src/mage/cards/c/ConqueringManticore.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,8 +37,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java b/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java index 349ff190712..68f8329472a 100644 --- a/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java +++ b/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/ConquerorsPledge.java b/Mage.Sets/src/mage/cards/c/ConquerorsPledge.java index 68ae1dd59d7..ceee98e8d95 100644 --- a/Mage.Sets/src/mage/cards/c/ConquerorsPledge.java +++ b/Mage.Sets/src/mage/cards/c/ConquerorsPledge.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.KorSoldierToken; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/ConsecrateLand.java b/Mage.Sets/src/mage/cards/c/ConsecrateLand.java index 8022f410aad..3bc1bb591ab 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecrateLand.java +++ b/Mage.Sets/src/mage/cards/c/ConsecrateLand.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -37,11 +36,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -49,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author MTGfan diff --git a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java index e1672108a16..c9143149ce7 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java +++ b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,17 +40,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ConsecratedSphinx.java b/Mage.Sets/src/mage/cards/c/ConsecratedSphinx.java index bf06bfc1f8a..13bec79861c 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecratedSphinx.java +++ b/Mage.Sets/src/mage/cards/c/ConsecratedSphinx.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Conservator.java b/Mage.Sets/src/mage/cards/c/Conservator.java index 4d4f57523ad..7af8299d870 100644 --- a/Mage.Sets/src/mage/cards/c/Conservator.java +++ b/Mage.Sets/src/mage/cards/c/Conservator.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/c/ConsignToDream.java b/Mage.Sets/src/mage/cards/c/ConsignToDream.java index 0d86a531b5f..894e539a76e 100644 --- a/Mage.Sets/src/mage/cards/c/ConsignToDream.java +++ b/Mage.Sets/src/mage/cards/c/ConsignToDream.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ConsignToDust.java b/Mage.Sets/src/mage/cards/c/ConsignToDust.java index bd2ec104fd8..6ebe1d2aa7f 100644 --- a/Mage.Sets/src/mage/cards/c/ConsignToDust.java +++ b/Mage.Sets/src/mage/cards/c/ConsignToDust.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.abilityword.StriveAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Conspiracy.java b/Mage.Sets/src/mage/cards/c/Conspiracy.java index 68dac6c0d9e..a0ae54169d7 100644 --- a/Mage.Sets/src/mage/cards/c/Conspiracy.java +++ b/Mage.Sets/src/mage/cards/c/Conspiracy.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -40,12 +37,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.repository.CardRepository; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -53,6 +45,10 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/ConstantMists.java b/Mage.Sets/src/mage/cards/c/ConstantMists.java index 05f8880b77e..89a53352904 100644 --- a/Mage.Sets/src/mage/cards/c/ConstantMists.java +++ b/Mage.Sets/src/mage/cards/c/ConstantMists.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.abilities.keyword.BuybackAbility; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java b/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java index 591a4c31595..6d6e90c54f5 100644 --- a/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java +++ b/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,11 +38,7 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -52,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java b/Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java index 388ded0c876..57096c77fb7 100644 --- a/Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java +++ b/Mage.Sets/src/mage/cards/c/ConstrictingTendrils.java @@ -28,16 +28,17 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ConsulateDreadnought.java b/Mage.Sets/src/mage/cards/c/ConsulateDreadnought.java index 2fb443f7d96..bc365bd50dc 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateDreadnought.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateDreadnought.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.CrewAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ConsulateSkygate.java b/Mage.Sets/src/mage/cards/c/ConsulateSkygate.java index daea2bedf80..5fcc782c145 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateSkygate.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateSkygate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ReachAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java b/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java index e9fa80e8e44..247e1529bcf 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayEnergyCost; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterObject; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConsulateTurret.java b/Mage.Sets/src/mage/cards/c/ConsulateTurret.java index 01d077cc803..6a6e5621554 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateTurret.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateTurret.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayEnergyCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/ConsulsLieutenant.java b/Mage.Sets/src/mage/cards/c/ConsulsLieutenant.java index 805ab0cb21e..611720bf248 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulsLieutenant.java +++ b/Mage.Sets/src/mage/cards/c/ConsulsLieutenant.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.condition.common.RenownedSourceCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConsultTheNecrosages.java b/Mage.Sets/src/mage/cards/c/ConsultTheNecrosages.java index 3675e7d2c5e..5c8aee37dda 100644 --- a/Mage.Sets/src/mage/cards/c/ConsultTheNecrosages.java +++ b/Mage.Sets/src/mage/cards/c/ConsultTheNecrosages.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Mode; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java b/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java index d4832c8d561..ce877ca228c 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java +++ b/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java @@ -27,21 +27,22 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.VariableCost; import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.FilterMana; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** diff --git a/Mage.Sets/src/mage/cards/c/ConsumeStrength.java b/Mage.Sets/src/mage/cards/c/ConsumeStrength.java index 1c6764bcff7..7bd265d8f79 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumeStrength.java +++ b/Mage.Sets/src/mage/cards/c/ConsumeStrength.java @@ -27,22 +27,19 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherTargetPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConsumeTheMeek.java b/Mage.Sets/src/mage/cards/c/ConsumeTheMeek.java index 712cc94d547..bde7cb602f0 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumeTheMeek.java +++ b/Mage.Sets/src/mage/cards/c/ConsumeTheMeek.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/ConsumingAberration.java b/Mage.Sets/src/mage/cards/c/ConsumingAberration.java index f9b9e47c28b..1805e023535 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingAberration.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingAberration.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -36,11 +35,7 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -48,6 +43,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java b/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java index 6051b5bb0cf..1c411efec00 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Poddo diff --git a/Mage.Sets/src/mage/cards/c/ConsumingSinkhole.java b/Mage.Sets/src/mage/cards/c/ConsumingSinkhole.java index afbfb02895e..eb97d679687 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingSinkhole.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingSinkhole.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ConsumingVapors.java b/Mage.Sets/src/mage/cards/c/ConsumingVapors.java index 13633f93f93..56a0ff80210 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingVapors.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingVapors.java @@ -27,15 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/c/ConsumingVortex.java b/Mage.Sets/src/mage/cards/c/ConsumingVortex.java index 83e17c50c54..cbecc46927b 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingVortex.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingVortex.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.SpliceOntoArcaneAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java b/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java index 5f583a27da9..28023be0e7d 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java +++ b/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/Contagion.java b/Mage.Sets/src/mage/cards/c/Contagion.java index 6db46caa910..a381f1f9a6d 100644 --- a/Mage.Sets/src/mage/cards/c/Contagion.java +++ b/Mage.Sets/src/mage/cards/c/Contagion.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/ContagionClasp.java b/Mage.Sets/src/mage/cards/c/ContagionClasp.java index d15a3800a0c..38299482b05 100644 --- a/Mage.Sets/src/mage/cards/c/ContagionClasp.java +++ b/Mage.Sets/src/mage/cards/c/ContagionClasp.java @@ -28,10 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,9 +37,14 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ContagionEngine.java b/Mage.Sets/src/mage/cards/c/ContagionEngine.java index a87d50e3f44..e7fe2e0cc30 100644 --- a/Mage.Sets/src/mage/cards/c/ContagionEngine.java +++ b/Mage.Sets/src/mage/cards/c/ContagionEngine.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +37,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.counters.CounterType; @@ -49,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ContagiousNim.java b/Mage.Sets/src/mage/cards/c/ContagiousNim.java index 48718cc354c..fa7030e9a9c 100644 --- a/Mage.Sets/src/mage/cards/c/ContagiousNim.java +++ b/Mage.Sets/src/mage/cards/c/ContagiousNim.java @@ -28,12 +28,13 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java b/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java index a5ace7825e7..2a1464d9f06 100644 --- a/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java +++ b/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ContainmentPriest.java b/Mage.Sets/src/mage/cards/c/ContainmentPriest.java index 625dcf0f5d8..304bb4676f5 100644 --- a/Mage.Sets/src/mage/cards/c/ContainmentPriest.java +++ b/Mage.Sets/src/mage/cards/c/ContainmentPriest.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.game.events.ZoneChangeEvent; import mage.players.Player; import mage.watchers.common.CreatureWasCastWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ContaminatedBond.java b/Mage.Sets/src/mage/cards/c/ContaminatedBond.java index a421fb7b92b..0e6601b7815 100644 --- a/Mage.Sets/src/mage/cards/c/ContaminatedBond.java +++ b/Mage.Sets/src/mage/cards/c/ContaminatedBond.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksEnchantedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ContaminatedGround.java b/Mage.Sets/src/mage/cards/c/ContaminatedGround.java index ccd8555aec5..0195aa87236 100644 --- a/Mage.Sets/src/mage/cards/c/ContaminatedGround.java +++ b/Mage.Sets/src/mage/cards/c/ContaminatedGround.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/Contamination.java b/Mage.Sets/src/mage/cards/c/Contamination.java index dae3792d0ab..9621a1eb943 100644 --- a/Mage.Sets/src/mage/cards/c/Contamination.java +++ b/Mage.Sets/src/mage/cards/c/Contamination.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.Mana; import mage.abilities.Ability; @@ -38,11 +37,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -50,6 +45,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.events.ManaEvent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/Contemplation.java b/Mage.Sets/src/mage/cards/c/Contemplation.java index e5b65078dce..f68ba9fb73f 100644 --- a/Mage.Sets/src/mage/cards/c/Contemplation.java +++ b/Mage.Sets/src/mage/cards/c/Contemplation.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java index a3a2c4dd8a9..b5a55967551 100644 --- a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java +++ b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -46,6 +45,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ContestedWarZone.java b/Mage.Sets/src/mage/cards/c/ContestedWarZone.java index 141422acd29..d6866985711 100644 --- a/Mage.Sets/src/mage/cards/c/ContestedWarZone.java +++ b/Mage.Sets/src/mage/cards/c/ContestedWarZone.java @@ -27,14 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; @@ -46,12 +38,15 @@ import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterAttackingCreature; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/ContingencyPlan.java b/Mage.Sets/src/mage/cards/c/ContingencyPlan.java index ac582ac7241..b17de5f9b90 100644 --- a/Mage.Sets/src/mage/cards/c/ContingencyPlan.java +++ b/Mage.Sets/src/mage/cards/c/ContingencyPlan.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/ContrabandKingpin.java b/Mage.Sets/src/mage/cards/c/ContrabandKingpin.java index f2252cc42ad..310160c8664 100644 --- a/Mage.Sets/src/mage/cards/c/ContrabandKingpin.java +++ b/Mage.Sets/src/mage/cards/c/ContrabandKingpin.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.keyword.ScryEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Contradict.java b/Mage.Sets/src/mage/cards/c/Contradict.java index 0a0306b0473..5231f2d6690 100644 --- a/Mage.Sets/src/mage/cards/c/Contradict.java +++ b/Mage.Sets/src/mage/cards/c/Contradict.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ControlMagic.java b/Mage.Sets/src/mage/cards/c/ControlMagic.java index c85056dd72d..597d33f0285 100644 --- a/Mage.Sets/src/mage/cards/c/ControlMagic.java +++ b/Mage.Sets/src/mage/cards/c/ControlMagic.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/c/ControlOfTheCourt.java b/Mage.Sets/src/mage/cards/c/ControlOfTheCourt.java index b14ee510378..e147e299084 100644 --- a/Mage.Sets/src/mage/cards/c/ControlOfTheCourt.java +++ b/Mage.Sets/src/mage/cards/c/ControlOfTheCourt.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.discard.DiscardControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ControlledInstincts.java b/Mage.Sets/src/mage/cards/c/ControlledInstincts.java index 71fbe245663..5d9dd450f0b 100644 --- a/Mage.Sets/src/mage/cards/c/ControlledInstincts.java +++ b/Mage.Sets/src/mage/cards/c/ControlledInstincts.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -38,12 +34,17 @@ import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEff import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/Controvert.java b/Mage.Sets/src/mage/cards/c/Controvert.java index 72a6e98a467..0437b9986c3 100644 --- a/Mage.Sets/src/mage/cards/c/Controvert.java +++ b/Mage.Sets/src/mage/cards/c/Controvert.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.keyword.RecoverAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ConundrumSphinx.java b/Mage.Sets/src/mage/cards/c/ConundrumSphinx.java index 1156891e429..55750922093 100644 --- a/Mage.Sets/src/mage/cards/c/ConundrumSphinx.java +++ b/Mage.Sets/src/mage/cards/c/ConundrumSphinx.java @@ -28,26 +28,23 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/Convalescence.java b/Mage.Sets/src/mage/cards/c/Convalescence.java index 0d7ceaf8a04..5b68aaff2dd 100644 --- a/Mage.Sets/src/mage/cards/c/Convalescence.java +++ b/Mage.Sets/src/mage/cards/c/Convalescence.java @@ -27,19 +27,19 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/ConversionChamber.java b/Mage.Sets/src/mage/cards/c/ConversionChamber.java index 5a47b6a1a13..030a5a207f3 100644 --- a/Mage.Sets/src/mage/cards/c/ConversionChamber.java +++ b/Mage.Sets/src/mage/cards/c/ConversionChamber.java @@ -28,7 +28,6 @@ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -46,6 +45,8 @@ import mage.filter.common.FilterArtifactCard; import mage.game.permanent.token.GolemToken; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ConvictedKiller.java b/Mage.Sets/src/mage/cards/c/ConvictedKiller.java index 0b2fb1c5052..9d7bf08d28b 100644 --- a/Mage.Sets/src/mage/cards/c/ConvictedKiller.java +++ b/Mage.Sets/src/mage/cards/c/ConvictedKiller.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -35,12 +34,14 @@ import mage.abilities.condition.common.NoSpellsWereCastLastTurnCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.b.BrandedHowler; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.b.BrandedHowler; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Conviction.java b/Mage.Sets/src/mage/cards/c/Conviction.java index cf4580b25ff..835591390c7 100644 --- a/Mage.Sets/src/mage/cards/c/Conviction.java +++ b/Mage.Sets/src/mage/cards/c/Conviction.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/ConvincingMirage.java b/Mage.Sets/src/mage/cards/c/ConvincingMirage.java index 1a2d1c9841b..2d4e1749d95 100644 --- a/Mage.Sets/src/mage/cards/c/ConvincingMirage.java +++ b/Mage.Sets/src/mage/cards/c/ConvincingMirage.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -35,24 +34,17 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.ChooseBasicLandTypeEffect; import mage.abilities.keyword.EnchantAbility; -import mage.abilities.mana.BlackManaAbility; -import mage.abilities.mana.BlueManaAbility; -import mage.abilities.mana.GreenManaAbility; -import mage.abilities.mana.RedManaAbility; -import mage.abilities.mana.WhiteManaAbility; +import mage.abilities.mana.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/Convolute.java b/Mage.Sets/src/mage/cards/c/Convolute.java index 527ce1d43ba..2c36cb2e586 100644 --- a/Mage.Sets/src/mage/cards/c/Convolute.java +++ b/Mage.Sets/src/mage/cards/c/Convolute.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/ConvulsingLicid.java b/Mage.Sets/src/mage/cards/c/ConvulsingLicid.java index e0cd1f3321f..22fe265cd4c 100644 --- a/Mage.Sets/src/mage/cards/c/ConvulsingLicid.java +++ b/Mage.Sets/src/mage/cards/c/ConvulsingLicid.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LicidAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CoordinatedAssault.java b/Mage.Sets/src/mage/cards/c/CoordinatedAssault.java index 628524a93c7..a0dd41d77ef 100644 --- a/Mage.Sets/src/mage/cards/c/CoordinatedAssault.java +++ b/Mage.Sets/src/mage/cards/c/CoordinatedAssault.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoordinatedBarrage.java b/Mage.Sets/src/mage/cards/c/CoordinatedBarrage.java index 9fbe9a14c69..fe7cd9f403c 100644 --- a/Mage.Sets/src/mage/cards/c/CoordinatedBarrage.java +++ b/Mage.Sets/src/mage/cards/c/CoordinatedBarrage.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CopperCarapace.java b/Mage.Sets/src/mage/cards/c/CopperCarapace.java index e40493bca22..c60c442cc3c 100644 --- a/Mage.Sets/src/mage/cards/c/CopperCarapace.java +++ b/Mage.Sets/src/mage/cards/c/CopperCarapace.java @@ -27,11 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.combat.CantBlockAttachedEffect; @@ -39,6 +34,12 @@ import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CopperGnomes.java b/Mage.Sets/src/mage/cards/c/CopperGnomes.java index d8f07519b2e..8c5074d8ad7 100644 --- a/Mage.Sets/src/mage/cards/c/CopperGnomes.java +++ b/Mage.Sets/src/mage/cards/c/CopperGnomes.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CopperMyr.java b/Mage.Sets/src/mage/cards/c/CopperMyr.java index acc736671e4..1d0d48601bd 100644 --- a/Mage.Sets/src/mage/cards/c/CopperMyr.java +++ b/Mage.Sets/src/mage/cards/c/CopperMyr.java @@ -28,12 +28,13 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CopperTablet.java b/Mage.Sets/src/mage/cards/c/CopperTablet.java index 40339075ebe..7a796f99a3b 100644 --- a/Mage.Sets/src/mage/cards/c/CopperTablet.java +++ b/Mage.Sets/src/mage/cards/c/CopperTablet.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java b/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java index 82c52854077..16366e6d24b 100644 --- a/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java +++ b/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/c/CopperhornScout.java b/Mage.Sets/src/mage/cards/c/CopperhornScout.java index b66d546c7a4..0df2e81898a 100644 --- a/Mage.Sets/src/mage/cards/c/CopperhornScout.java +++ b/Mage.Sets/src/mage/cards/c/CopperhornScout.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -44,6 +42,9 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.List; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/c/CopperlineGorge.java b/Mage.Sets/src/mage/cards/c/CopperlineGorge.java index a5231c49d7b..2f6bac02761 100644 --- a/Mage.Sets/src/mage/cards/c/CopperlineGorge.java +++ b/Mage.Sets/src/mage/cards/c/CopperlineGorge.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -43,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/c/CopyArtifact.java b/Mage.Sets/src/mage/cards/c/CopyArtifact.java index 835d7a1c2c1..5de8f5e4283 100644 --- a/Mage.Sets/src/mage/cards/c/CopyArtifact.java +++ b/Mage.Sets/src/mage/cards/c/CopyArtifact.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CopyPermanentEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactPermanent; import mage.util.functions.CardTypeApplier; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/c/CopyEnchantment.java b/Mage.Sets/src/mage/cards/c/CopyEnchantment.java index 210deb016eb..798e120d216 100644 --- a/Mage.Sets/src/mage/cards/c/CopyEnchantment.java +++ b/Mage.Sets/src/mage/cards/c/CopyEnchantment.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.Target; import mage.util.functions.EmptyApplyToPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoralAtoll.java b/Mage.Sets/src/mage/cards/c/CoralAtoll.java index 0eb07d18d79..f0c26e72495 100644 --- a/Mage.Sets/src/mage/cards/c/CoralAtoll.java +++ b/Mage.Sets/src/mage/cards/c/CoralAtoll.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoralBarrier.java b/Mage.Sets/src/mage/cards/c/CoralBarrier.java index 5086083a041..5dce0fb7420 100644 --- a/Mage.Sets/src/mage/cards/c/CoralBarrier.java +++ b/Mage.Sets/src/mage/cards/c/CoralBarrier.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoralFighters.java b/Mage.Sets/src/mage/cards/c/CoralFighters.java index 677b0855da2..7ac63fd41d5 100644 --- a/Mage.Sets/src/mage/cards/c/CoralFighters.java +++ b/Mage.Sets/src/mage/cards/c/CoralFighters.java @@ -27,22 +27,19 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CoralHelm.java b/Mage.Sets/src/mage/cards/c/CoralHelm.java index eefbebec4a1..25b0bb14a59 100644 --- a/Mage.Sets/src/mage/cards/c/CoralHelm.java +++ b/Mage.Sets/src/mage/cards/c/CoralHelm.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -41,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/c/CoralMerfolk.java b/Mage.Sets/src/mage/cards/c/CoralMerfolk.java index d61c8f8950b..1679788c09f 100644 --- a/Mage.Sets/src/mage/cards/c/CoralMerfolk.java +++ b/Mage.Sets/src/mage/cards/c/CoralMerfolk.java @@ -28,11 +28,12 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CoralNet.java b/Mage.Sets/src/mage/cards/c/CoralNet.java index babc8829bdb..df2047e081e 100644 --- a/Mage.Sets/src/mage/cards/c/CoralNet.java +++ b/Mage.Sets/src/mage/cards/c/CoralNet.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,18 +38,15 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CoralReef.java b/Mage.Sets/src/mage/cards/c/CoralReef.java index 634ae0fcd55..599aa06f87b 100644 --- a/Mage.Sets/src/mage/cards/c/CoralReef.java +++ b/Mage.Sets/src/mage/cards/c/CoralReef.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -54,6 +53,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CoralTrickster.java b/Mage.Sets/src/mage/cards/c/CoralTrickster.java index 967b1231f60..53299189d47 100644 --- a/Mage.Sets/src/mage/cards/c/CoralTrickster.java +++ b/Mage.Sets/src/mage/cards/c/CoralTrickster.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java b/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java index 48c593198e4..24e4a3a081f 100644 --- a/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java +++ b/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoreProwler.java b/Mage.Sets/src/mage/cards/c/CoreProwler.java index 9e7a5f187de..67d942e439b 100644 --- a/Mage.Sets/src/mage/cards/c/CoreProwler.java +++ b/Mage.Sets/src/mage/cards/c/CoreProwler.java @@ -28,14 +28,15 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CorellianCorvette.java b/Mage.Sets/src/mage/cards/c/CorellianCorvette.java index b753dea8416..9040af8de47 100644 --- a/Mage.Sets/src/mage/cards/c/CorellianCorvette.java +++ b/Mage.Sets/src/mage/cards/c/CorellianCorvette.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.abilities.keyword.SpaceflightAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/Coretapper.java b/Mage.Sets/src/mage/cards/c/Coretapper.java index 28d3cfe2fd5..ff60433e00d 100644 --- a/Mage.Sets/src/mage/cards/c/Coretapper.java +++ b/Mage.Sets/src/mage/cards/c/Coretapper.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +36,15 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CorpseAugur.java b/Mage.Sets/src/mage/cards/c/CorpseAugur.java index 4b3629df341..f4d4b0d1a5c 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseAugur.java +++ b/Mage.Sets/src/mage/cards/c/CorpseAugur.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CorpseBlockade.java b/Mage.Sets/src/mage/cards/c/CorpseBlockade.java index 49cdc96cf2c..b81fb701b6c 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseBlockade.java +++ b/Mage.Sets/src/mage/cards/c/CorpseBlockade.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,11 +35,15 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CorpseChurn.java b/Mage.Sets/src/mage/cards/c/CorpseChurn.java index 0a95de02427..e66b28b34f4 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseChurn.java +++ b/Mage.Sets/src/mage/cards/c/CorpseChurn.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java b/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java index 9917868bd94..4878bff3bc0 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java +++ b/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +36,7 @@ import mage.abilities.keyword.UnearthAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; @@ -46,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CorpseCur.java b/Mage.Sets/src/mage/cards/c/CorpseCur.java index 4265bca51f6..c384daf3bcf 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseCur.java +++ b/Mage.Sets/src/mage/cards/c/CorpseCur.java @@ -28,8 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,10 +35,13 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CorpseDance.java b/Mage.Sets/src/mage/cards/c/CorpseDance.java index 02220e40b5e..01757f88bd0 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseDance.java +++ b/Mage.Sets/src/mage/cards/c/CorpseDance.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CorpseHarvester.java b/Mage.Sets/src/mage/cards/c/CorpseHarvester.java index d1ef40977c4..4eeab321574 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseHarvester.java +++ b/Mage.Sets/src/mage/cards/c/CorpseHarvester.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,12 +34,10 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -53,6 +47,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CorpseHauler.java b/Mage.Sets/src/mage/cards/c/CorpseHauler.java index c36da250bde..6e6e6d8dd92 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseHauler.java +++ b/Mage.Sets/src/mage/cards/c/CorpseHauler.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.AnotherCardPredicate; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CorpseLunge.java b/Mage.Sets/src/mage/cards/c/CorpseLunge.java index 38b75151c8b..da1a236fcc8 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseLunge.java +++ b/Mage.Sets/src/mage/cards/c/CorpseLunge.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.ExileFromGraveCost; @@ -37,12 +34,16 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CorpseTraders.java b/Mage.Sets/src/mage/cards/c/CorpseTraders.java index b443ab27508..10da227b75c 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseTraders.java +++ b/Mage.Sets/src/mage/cards/c/CorpseTraders.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -36,6 +35,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/c/Corpsehatch.java b/Mage.Sets/src/mage/cards/c/Corpsehatch.java index 972d5c073e0..0cabd75dc38 100644 --- a/Mage.Sets/src/mage/cards/c/Corpsehatch.java +++ b/Mage.Sets/src/mage/cards/c/Corpsehatch.java @@ -27,19 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.permanent.token.EldraziSpawnToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CorpsejackMenace.java b/Mage.Sets/src/mage/cards/c/CorpsejackMenace.java index 82ba7a9bd02..5ea0450b551 100644 --- a/Mage.Sets/src/mage/cards/c/CorpsejackMenace.java +++ b/Mage.Sets/src/mage/cards/c/CorpsejackMenace.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * http://www.wizards.com/magic/magazine/article.aspx?x=mtg/faq/rtr * diff --git a/Mage.Sets/src/mage/cards/c/Corpseweft.java b/Mage.Sets/src/mage/cards/c/Corpseweft.java index 27036d1cbe0..67b002e7147 100644 --- a/Mage.Sets/src/mage/cards/c/Corpseweft.java +++ b/Mage.Sets/src/mage/cards/c/Corpseweft.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CorpulentCorpse.java b/Mage.Sets/src/mage/cards/c/CorpulentCorpse.java index c383a5db9e3..a5006df8b13 100644 --- a/Mage.Sets/src/mage/cards/c/CorpulentCorpse.java +++ b/Mage.Sets/src/mage/cards/c/CorpulentCorpse.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FearAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CorrosiveGale.java b/Mage.Sets/src/mage/cards/c/CorrosiveGale.java index 40ba94ad44e..b71eabf8409 100644 --- a/Mage.Sets/src/mage/cards/c/CorrosiveGale.java +++ b/Mage.Sets/src/mage/cards/c/CorrosiveGale.java @@ -27,16 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CorrosiveMentor.java b/Mage.Sets/src/mage/cards/c/CorrosiveMentor.java index 17ff586e169..a8ee8887756 100644 --- a/Mage.Sets/src/mage/cards/c/CorrosiveMentor.java +++ b/Mage.Sets/src/mage/cards/c/CorrosiveMentor.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -38,9 +34,14 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/Corrupt.java b/Mage.Sets/src/mage/cards/c/Corrupt.java index 3bd987a8ee4..6198667f3e1 100644 --- a/Mage.Sets/src/mage/cards/c/Corrupt.java +++ b/Mage.Sets/src/mage/cards/c/Corrupt.java @@ -28,14 +28,13 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CorruptCourtOfficial.java b/Mage.Sets/src/mage/cards/c/CorruptCourtOfficial.java index ece971b5d24..701b9d9a8aa 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptCourtOfficial.java +++ b/Mage.Sets/src/mage/cards/c/CorruptCourtOfficial.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CorruptEunuchs.java b/Mage.Sets/src/mage/cards/c/CorruptEunuchs.java index e0009bee6e6..f817d7f2316 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptEunuchs.java +++ b/Mage.Sets/src/mage/cards/c/CorruptEunuchs.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java index 461e8b0d6ea..24945fca814 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java +++ b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CorruptedConscience.java b/Mage.Sets/src/mage/cards/c/CorruptedConscience.java index 66f4a9766d1..104c57e1907 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedConscience.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedConscience.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CorruptedCrossroads.java b/Mage.Sets/src/mage/cards/c/CorruptedCrossroads.java index cd323c5fa66..e4d6b4ace3b 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedCrossroads.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedCrossroads.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ConditionalMana; import mage.MageObject; import mage.Mana; @@ -43,6 +42,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.Game; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CorruptedGrafstone.java b/Mage.Sets/src/mage/cards/c/CorruptedGrafstone.java index 5d2668e8f0e..0660789ad74 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedGrafstone.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedGrafstone.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -48,6 +45,10 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java b/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java index 215c00fadd7..604f4c8c98e 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CorruptedResolve.java b/Mage.Sets/src/mage/cards/c/CorruptedResolve.java index bdbaf48125f..414b44cdba4 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedResolve.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedResolve.java @@ -27,13 +27,11 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; @@ -41,6 +39,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CorruptedRoots.java b/Mage.Sets/src/mage/cards/c/CorruptedRoots.java index 8653146186b..c4ffe024000 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedRoots.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedRoots.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java index a9712413b6c..ea4f03c8f24 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -38,11 +37,16 @@ import mage.abilities.effects.common.continuous.BecomesCreatureAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CorruptingLicid.java b/Mage.Sets/src/mage/cards/c/CorruptingLicid.java index 5fc0e9dc428..0932fa7ef83 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptingLicid.java +++ b/Mage.Sets/src/mage/cards/c/CorruptingLicid.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LicidAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CosisRavager.java b/Mage.Sets/src/mage/cards/c/CosisRavager.java index f68d987e4ab..d929ca3fab5 100644 --- a/Mage.Sets/src/mage/cards/c/CosisRavager.java +++ b/Mage.Sets/src/mage/cards/c/CosisRavager.java @@ -28,16 +28,17 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CosisTrickster.java b/Mage.Sets/src/mage/cards/c/CosisTrickster.java index 63c295626b3..fb3dae51249 100644 --- a/Mage.Sets/src/mage/cards/c/CosisTrickster.java +++ b/Mage.Sets/src/mage/cards/c/CosisTrickster.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CosmicHorror.java b/Mage.Sets/src/mage/cards/c/CosmicHorror.java index 464a0cabb41..41e59e061c3 100644 --- a/Mage.Sets/src/mage/cards/c/CosmicHorror.java +++ b/Mage.Sets/src/mage/cards/c/CosmicHorror.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CosmicLarva.java b/Mage.Sets/src/mage/cards/c/CosmicLarva.java index ffb4c2d393b..93f552bc63b 100644 --- a/Mage.Sets/src/mage/cards/c/CosmicLarva.java +++ b/Mage.Sets/src/mage/cards/c/CosmicLarva.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -40,6 +39,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CouncilGuardian.java b/Mage.Sets/src/mage/cards/c/CouncilGuardian.java index cee931c9f56..9e06ae0992a 100644 --- a/Mage.Sets/src/mage/cards/c/CouncilGuardian.java +++ b/Mage.Sets/src/mage/cards/c/CouncilGuardian.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -46,6 +43,10 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/CouncilOfAdvisors.java b/Mage.Sets/src/mage/cards/c/CouncilOfAdvisors.java index 348b1d5f010..ef0b3d703f1 100644 --- a/Mage.Sets/src/mage/cards/c/CouncilOfAdvisors.java +++ b/Mage.Sets/src/mage/cards/c/CouncilOfAdvisors.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java b/Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java index ba3d9c6ae47..c89d676ceff 100644 --- a/Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java +++ b/Mage.Sets/src/mage/cards/c/CouncilOfTheAbsolute.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -41,16 +40,14 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CouncilsJudgment.java b/Mage.Sets/src/mage/cards/c/CouncilsJudgment.java index 2972690b4c7..3eb2f141411 100644 --- a/Mage.Sets/src/mage/cards/c/CouncilsJudgment.java +++ b/Mage.Sets/src/mage/cards/c/CouncilsJudgment.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -47,6 +43,11 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetNonlandPermanent; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CounselOfTheSoratami.java b/Mage.Sets/src/mage/cards/c/CounselOfTheSoratami.java index d3a938775a3..6bfb27a4cf8 100644 --- a/Mage.Sets/src/mage/cards/c/CounselOfTheSoratami.java +++ b/Mage.Sets/src/mage/cards/c/CounselOfTheSoratami.java @@ -28,11 +28,12 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Counterbalance.java b/Mage.Sets/src/mage/cards/c/Counterbalance.java index 7b65de25add..920c06f7b25 100644 --- a/Mage.Sets/src/mage/cards/c/Counterbalance.java +++ b/Mage.Sets/src/mage/cards/c/Counterbalance.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -37,6 +34,8 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.FilterSpell; @@ -46,6 +45,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/Counterbore.java b/Mage.Sets/src/mage/cards/c/Counterbore.java index 35c6d2e8646..39ab0a2432b 100644 --- a/Mage.Sets/src/mage/cards/c/Counterbore.java +++ b/Mage.Sets/src/mage/cards/c/Counterbore.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Counterintelligence.java b/Mage.Sets/src/mage/cards/c/Counterintelligence.java index 7f5d6fc9eea..2588484b08d 100644 --- a/Mage.Sets/src/mage/cards/c/Counterintelligence.java +++ b/Mage.Sets/src/mage/cards/c/Counterintelligence.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Countermand.java b/Mage.Sets/src/mage/cards/c/Countermand.java index d94d3d640fe..c87687b8ed2 100644 --- a/Mage.Sets/src/mage/cards/c/Countermand.java +++ b/Mage.Sets/src/mage/cards/c/Countermand.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Counterspell.java b/Mage.Sets/src/mage/cards/c/Counterspell.java index 3140049bb8a..3bfa3540654 100644 --- a/Mage.Sets/src/mage/cards/c/Counterspell.java +++ b/Mage.Sets/src/mage/cards/c/Counterspell.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Countersquall.java b/Mage.Sets/src/mage/cards/c/Countersquall.java index d767ac2ad2d..cd937a5fd8c 100644 --- a/Mage.Sets/src/mage/cards/c/Countersquall.java +++ b/Mage.Sets/src/mage/cards/c/Countersquall.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.LoseLifeTargetControllerEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java b/Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java index 07aa488d006..ed225e0879d 100644 --- a/Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java +++ b/Mage.Sets/src/mage/cards/c/CountlessGearsRenegade.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.game.permanent.token.ServoToken; import mage.watchers.common.RevoltWatcher; +import java.util.UUID; + /** * @author JRHerlehy */ diff --git a/Mage.Sets/src/mage/cards/c/CountrysideCrusher.java b/Mage.Sets/src/mage/cards/c/CountrysideCrusher.java index e0419c580cd..374669ead51 100644 --- a/Mage.Sets/src/mage/cards/c/CountrysideCrusher.java +++ b/Mage.Sets/src/mage/cards/c/CountrysideCrusher.java @@ -27,18 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -49,6 +44,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java index f62067fe36d..e01a7a9450e 100644 --- a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java +++ b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CourierGriffin.java b/Mage.Sets/src/mage/cards/c/CourierGriffin.java index 16d0072b56f..ba9130707fa 100644 --- a/Mage.Sets/src/mage/cards/c/CourierGriffin.java +++ b/Mage.Sets/src/mage/cards/c/CourierGriffin.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CourierHawk.java b/Mage.Sets/src/mage/cards/c/CourierHawk.java index dc38e4c2b10..a8dfcdcb7ae 100644 --- a/Mage.Sets/src/mage/cards/c/CourierHawk.java +++ b/Mage.Sets/src/mage/cards/c/CourierHawk.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CouriersCapsule.java b/Mage.Sets/src/mage/cards/c/CouriersCapsule.java index 96ba6420a2d..b13209a465b 100644 --- a/Mage.Sets/src/mage/cards/c/CouriersCapsule.java +++ b/Mage.Sets/src/mage/cards/c/CouriersCapsule.java @@ -28,18 +28,18 @@ package mage.cards.c; -import java.util.UUID; - -import mage.abilities.costs.common.TapSourceCost; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; +import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CourserOfKruphix.java b/Mage.Sets/src/mage/cards/c/CourserOfKruphix.java index 0cbed01e5b4..f60100fc13d 100644 --- a/Mage.Sets/src/mage/cards/c/CourserOfKruphix.java +++ b/Mage.Sets/src/mage/cards/c/CourserOfKruphix.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CoursersAccord.java b/Mage.Sets/src/mage/cards/c/CoursersAccord.java index dcc38ae3d02..6e978396cae 100644 --- a/Mage.Sets/src/mage/cards/c/CoursersAccord.java +++ b/Mage.Sets/src/mage/cards/c/CoursersAccord.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.CentaurToken; +import java.util.UUID; + /** * * @author LevleX2 diff --git a/Mage.Sets/src/mage/cards/c/CourtArchers.java b/Mage.Sets/src/mage/cards/c/CourtArchers.java index 8f393d7bd4b..09b86b4a365 100644 --- a/Mage.Sets/src/mage/cards/c/CourtArchers.java +++ b/Mage.Sets/src/mage/cards/c/CourtArchers.java @@ -28,13 +28,14 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CourtHomunculus.java b/Mage.Sets/src/mage/cards/c/CourtHomunculus.java index bad084faa3e..465b72b4b93 100644 --- a/Mage.Sets/src/mage/cards/c/CourtHomunculus.java +++ b/Mage.Sets/src/mage/cards/c/CourtHomunculus.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +35,9 @@ import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/c/CourtHussar.java b/Mage.Sets/src/mage/cards/c/CourtHussar.java index 3a77184cf18..29589341e96 100644 --- a/Mage.Sets/src/mage/cards/c/CourtHussar.java +++ b/Mage.Sets/src/mage/cards/c/CourtHussar.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ManaWasSpentCondition; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.watchers.common.ManaSpentToCastWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java b/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java index 814e032d659..e4bc77999ba 100644 --- a/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java +++ b/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,6 +34,9 @@ import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java b/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java index 9a2642c6fcc..45260322c33 100644 --- a/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java +++ b/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.keyword.AttacksThisTurnMarkerAbility; import mage.abilities.keyword.BlocksThisTurnMarkerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java b/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java index f007435feaa..975358ae9a9 100644 --- a/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java +++ b/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CovenantOfMinds.java b/Mage.Sets/src/mage/cards/c/CovenantOfMinds.java index 43a35bfd05f..572f2629000 100644 --- a/Mage.Sets/src/mage/cards/c/CovenantOfMinds.java +++ b/Mage.Sets/src/mage/cards/c/CovenantOfMinds.java @@ -27,20 +27,21 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java b/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java index 84f2075a4bc..7b022d84241 100644 --- a/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java +++ b/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.ChooseCreatureTypeEffect; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CovertOperative.java b/Mage.Sets/src/mage/cards/c/CovertOperative.java index c6f450db581..70235251bba 100644 --- a/Mage.Sets/src/mage/cards/c/CovertOperative.java +++ b/Mage.Sets/src/mage/cards/c/CovertOperative.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.CantBeBlockedSourceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CovetousDragon.java b/Mage.Sets/src/mage/cards/c/CovetousDragon.java index a8bae47e676..13a040ef189 100644 --- a/Mage.Sets/src/mage/cards/c/CovetousDragon.java +++ b/Mage.Sets/src/mage/cards/c/CovetousDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.Filter; import mage.filter.common.FilterArtifactPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Cowardice.java b/Mage.Sets/src/mage/cards/c/Cowardice.java index 97ae09c8fc0..7bdff8705c4 100644 --- a/Mage.Sets/src/mage/cards/c/Cowardice.java +++ b/Mage.Sets/src/mage/cards/c/Cowardice.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.game.stack.StackObject; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java index e1e2290bdc5..ac5da654efe 100644 --- a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java +++ b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -49,6 +48,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CowerInFear.java b/Mage.Sets/src/mage/cards/c/CowerInFear.java index 69f2a8d2d3c..23caee5d1ee 100644 --- a/Mage.Sets/src/mage/cards/c/CowerInFear.java +++ b/Mage.Sets/src/mage/cards/c/CowerInFear.java @@ -27,17 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CowlProwler.java b/Mage.Sets/src/mage/cards/c/CowlProwler.java index 0ecc0a0748b..144a180b82e 100644 --- a/Mage.Sets/src/mage/cards/c/CowlProwler.java +++ b/Mage.Sets/src/mage/cards/c/CowlProwler.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrabUmbra.java b/Mage.Sets/src/mage/cards/c/CrabUmbra.java index 6efb4691ed8..f6f51ec7d0e 100644 --- a/Mage.Sets/src/mage/cards/c/CrabUmbra.java +++ b/Mage.Sets/src/mage/cards/c/CrabUmbra.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,11 +36,14 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TotemArmorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java index cc9f7796e0f..ff28c86aab8 100644 --- a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java +++ b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.CountType; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CrackTheEarth.java b/Mage.Sets/src/mage/cards/c/CrackTheEarth.java index efaf0d5f76a..3f58a6c559a 100644 --- a/Mage.Sets/src/mage/cards/c/CrackTheEarth.java +++ b/Mage.Sets/src/mage/cards/c/CrackTheEarth.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/c/Crackdown.java b/Mage.Sets/src/mage/cards/c/Crackdown.java index ee066ea2f5c..e88287d5037 100644 --- a/Mage.Sets/src/mage/cards/c/Crackdown.java +++ b/Mage.Sets/src/mage/cards/c/Crackdown.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrackdownConstruct.java b/Mage.Sets/src/mage/cards/c/CrackdownConstruct.java index beca085b919..cb4e0c8c13a 100644 --- a/Mage.Sets/src/mage/cards/c/CrackdownConstruct.java +++ b/Mage.Sets/src/mage/cards/c/CrackdownConstruct.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.StackAbility; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/Crackleburr.java b/Mage.Sets/src/mage/cards/c/Crackleburr.java index 0078728151d..05b34197dfd 100644 --- a/Mage.Sets/src/mage/cards/c/Crackleburr.java +++ b/Mage.Sets/src/mage/cards/c/Crackleburr.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -51,6 +50,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CracklingClub.java b/Mage.Sets/src/mage/cards/c/CracklingClub.java index 289d0ce00d7..03f4ee16fd2 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingClub.java +++ b/Mage.Sets/src/mage/cards/c/CracklingClub.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CracklingDoom.java b/Mage.Sets/src/mage/cards/c/CracklingDoom.java index 77e9720a4e2..c84c29edcab 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingDoom.java +++ b/Mage.Sets/src/mage/cards/c/CracklingDoom.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamagePlayersEffect; @@ -47,6 +45,9 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java index 93722564c82..97d2a1d59e1 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java +++ b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java @@ -27,22 +27,22 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.DamagePlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CracklingTriton.java b/Mage.Sets/src/mage/cards/c/CracklingTriton.java index 76d2daccd01..27f54c0800c 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingTriton.java +++ b/Mage.Sets/src/mage/cards/c/CracklingTriton.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CradleGuard.java b/Mage.Sets/src/mage/cards/c/CradleGuard.java index adf7896a97b..ddd34eeed8d 100644 --- a/Mage.Sets/src/mage/cards/c/CradleGuard.java +++ b/Mage.Sets/src/mage/cards/c/CradleGuard.java @@ -28,13 +28,14 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CradleOfVitality.java b/Mage.Sets/src/mage/cards/c/CradleOfVitality.java index 2343978634a..d1f414087af 100644 --- a/Mage.Sets/src/mage/cards/c/CradleOfVitality.java +++ b/Mage.Sets/src/mage/cards/c/CradleOfVitality.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Alvin diff --git a/Mage.Sets/src/mage/cards/c/CradleToGrave.java b/Mage.Sets/src/mage/cards/c/CradleToGrave.java index 494731992d4..8d547d1a57d 100644 --- a/Mage.Sets/src/mage/cards/c/CradleToGrave.java +++ b/Mage.Sets/src/mage/cards/c/CradleToGrave.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.EnteredThisTurnPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author bieno002 diff --git a/Mage.Sets/src/mage/cards/c/CraftyPathmage.java b/Mage.Sets/src/mage/cards/c/CraftyPathmage.java index 8113b0d68e8..a0ba0229c75 100644 --- a/Mage.Sets/src/mage/cards/c/CraftyPathmage.java +++ b/Mage.Sets/src/mage/cards/c/CraftyPathmage.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +34,15 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CragPuca.java b/Mage.Sets/src/mage/cards/c/CragPuca.java index eb1d1cde53e..a854ad9079d 100644 --- a/Mage.Sets/src/mage/cards/c/CragPuca.java +++ b/Mage.Sets/src/mage/cards/c/CragPuca.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CragganwickCremator.java b/Mage.Sets/src/mage/cards/c/CragganwickCremator.java index 7906a40469b..1c479906220 100644 --- a/Mage.Sets/src/mage/cards/c/CragganwickCremator.java +++ b/Mage.Sets/src/mage/cards/c/CragganwickCremator.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CranialArchive.java b/Mage.Sets/src/mage/cards/c/CranialArchive.java index e6707e81e47..48fe362169f 100644 --- a/Mage.Sets/src/mage/cards/c/CranialArchive.java +++ b/Mage.Sets/src/mage/cards/c/CranialArchive.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileSourceCost; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CranialExtraction.java b/Mage.Sets/src/mage/cards/c/CranialExtraction.java index 8d871d7e39e..1763aa11449 100644 --- a/Mage.Sets/src/mage/cards/c/CranialExtraction.java +++ b/Mage.Sets/src/mage/cards/c/CranialExtraction.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CranialPlating.java b/Mage.Sets/src/mage/cards/c/CranialPlating.java index eb8c35829ad..b96dac6db06 100644 --- a/Mage.Sets/src/mage/cards/c/CranialPlating.java +++ b/Mage.Sets/src/mage/cards/c/CranialPlating.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,12 +39,15 @@ 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.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/Crash.java b/Mage.Sets/src/mage/cards/c/Crash.java index a19ef0a4b81..336a895961f 100644 --- a/Mage.Sets/src/mage/cards/c/Crash.java +++ b/Mage.Sets/src/mage/cards/c/Crash.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; @@ -43,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/c/CrashOfRhinos.java b/Mage.Sets/src/mage/cards/c/CrashOfRhinos.java index 4e7e3b62393..1f13e5224e6 100644 --- a/Mage.Sets/src/mage/cards/c/CrashOfRhinos.java +++ b/Mage.Sets/src/mage/cards/c/CrashOfRhinos.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CrashingBoars.java b/Mage.Sets/src/mage/cards/c/CrashingBoars.java index 16d8ec6fbc7..15e2aa8c8da 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingBoars.java +++ b/Mage.Sets/src/mage/cards/c/CrashingBoars.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -48,6 +47,8 @@ import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CrashingCentaur.java b/Mage.Sets/src/mage/cards/c/CrashingCentaur.java index e9b609b3efb..0f6c114281b 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingCentaur.java +++ b/Mage.Sets/src/mage/cards/c/CrashingCentaur.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CraterElemental.java b/Mage.Sets/src/mage/cards/c/CraterElemental.java index 38615fc135d..45e82a62d68 100644 --- a/Mage.Sets/src/mage/cards/c/CraterElemental.java +++ b/Mage.Sets/src/mage/cards/c/CraterElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -47,6 +46,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CraterHellion.java b/Mage.Sets/src/mage/cards/c/CraterHellion.java index c0deba9715a..d9dd125e1e6 100644 --- a/Mage.Sets/src/mage/cards/c/CraterHellion.java +++ b/Mage.Sets/src/mage/cards/c/CraterHellion.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +40,9 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.List; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/c/CraterhoofBehemoth.java b/Mage.Sets/src/mage/cards/c/CraterhoofBehemoth.java index 4130f8bc08e..4250d25ee7a 100644 --- a/Mage.Sets/src/mage/cards/c/CraterhoofBehemoth.java +++ b/Mage.Sets/src/mage/cards/c/CraterhoofBehemoth.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,12 +37,14 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.TargetController; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; -import mage.filter.common.FilterControlledCreaturePermanent; /** * diff --git a/Mage.Sets/src/mage/cards/c/Craterize.java b/Mage.Sets/src/mage/cards/c/Craterize.java index f52010a8678..6983846ec1c 100644 --- a/Mage.Sets/src/mage/cards/c/Craterize.java +++ b/Mage.Sets/src/mage/cards/c/Craterize.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CratersClaws.java b/Mage.Sets/src/mage/cards/c/CratersClaws.java index 266f2ac8ee7..7c337f5d2da 100644 --- a/Mage.Sets/src/mage/cards/c/CratersClaws.java +++ b/Mage.Sets/src/mage/cards/c/CratersClaws.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.dynamicvalue.IntPlusDynamicValue; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CravenGiant.java b/Mage.Sets/src/mage/cards/c/CravenGiant.java index 42fcba22bc9..ea71d70084e 100644 --- a/Mage.Sets/src/mage/cards/c/CravenGiant.java +++ b/Mage.Sets/src/mage/cards/c/CravenGiant.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CravenKnight.java b/Mage.Sets/src/mage/cards/c/CravenKnight.java index 508965233c2..5cfe87dc9cf 100644 --- a/Mage.Sets/src/mage/cards/c/CravenKnight.java +++ b/Mage.Sets/src/mage/cards/c/CravenKnight.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrawGiant.java b/Mage.Sets/src/mage/cards/c/CrawGiant.java index 29c242cd195..162e9426d42 100644 --- a/Mage.Sets/src/mage/cards/c/CrawGiant.java +++ b/Mage.Sets/src/mage/cards/c/CrawGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.RampageAbility; import mage.abilities.keyword.TrampleAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CrawWurm.java b/Mage.Sets/src/mage/cards/c/CrawWurm.java index bb1f6ed4c24..8e754aa2c08 100644 --- a/Mage.Sets/src/mage/cards/c/CrawWurm.java +++ b/Mage.Sets/src/mage/cards/c/CrawWurm.java @@ -27,11 +27,12 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CrawlingFilth.java b/Mage.Sets/src/mage/cards/c/CrawlingFilth.java index 1f69bd492af..f0f0908f944 100644 --- a/Mage.Sets/src/mage/cards/c/CrawlingFilth.java +++ b/Mage.Sets/src/mage/cards/c/CrawlingFilth.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CrawlingSensation.java b/Mage.Sets/src/mage/cards/c/CrawlingSensation.java index de1845da66d..ee666462774 100644 --- a/Mage.Sets/src/mage/cards/c/CrawlingSensation.java +++ b/Mage.Sets/src/mage/cards/c/CrawlingSensation.java @@ -28,9 +28,6 @@ */ package mage.cards.c; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -45,6 +42,9 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeGroupEvent; import mage.game.permanent.token.InsectToken; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Crawlspace.java b/Mage.Sets/src/mage/cards/c/Crawlspace.java index 3e425bbf497..5f7742a2004 100644 --- a/Mage.Sets/src/mage/cards/c/Crawlspace.java +++ b/Mage.Sets/src/mage/cards/c/Crawlspace.java @@ -27,21 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrazedGoblin.java b/Mage.Sets/src/mage/cards/c/CrazedGoblin.java index f50774f53f9..0c3ee6fa8ee 100644 --- a/Mage.Sets/src/mage/cards/c/CrazedGoblin.java +++ b/Mage.Sets/src/mage/cards/c/CrazedGoblin.java @@ -28,13 +28,13 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CrazedSkirge.java b/Mage.Sets/src/mage/cards/c/CrazedSkirge.java index 11c636752d8..67ad235b2f0 100644 --- a/Mage.Sets/src/mage/cards/c/CrazedSkirge.java +++ b/Mage.Sets/src/mage/cards/c/CrazedSkirge.java @@ -28,13 +28,14 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java b/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java index 463ccd41c5d..70c37dfe8e2 100644 --- a/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java +++ b/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java b/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java index 6c88f923b4e..6883c4d098b 100644 --- a/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java +++ b/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java b/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java index 2ba4fb30945..f49cd902aa3 100644 --- a/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java +++ b/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java @@ -27,15 +27,10 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SetTargetPointer; @@ -48,6 +43,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CreatureBond.java b/Mage.Sets/src/mage/cards/c/CreatureBond.java index b88a1283b2f..ac684e8b7a4 100644 --- a/Mage.Sets/src/mage/cards/c/CreatureBond.java +++ b/Mage.Sets/src/mage/cards/c/CreatureBond.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.dynamicvalue.common.AttachedPermanentToughnessValue; @@ -41,6 +40,8 @@ import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author MTGfan diff --git a/Mage.Sets/src/mage/cards/c/Creeperhulk.java b/Mage.Sets/src/mage/cards/c/Creeperhulk.java index 82258d5be25..5f651146053 100644 --- a/Mage.Sets/src/mage/cards/c/Creeperhulk.java +++ b/Mage.Sets/src/mage/cards/c/Creeperhulk.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CreepingCorrosion.java b/Mage.Sets/src/mage/cards/c/CreepingCorrosion.java index ba20fbb7e24..0c2fb8755df 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingCorrosion.java +++ b/Mage.Sets/src/mage/cards/c/CreepingCorrosion.java @@ -27,13 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterArtifactPermanent; +import java.util.UUID; + /** * * @author Viserion diff --git a/Mage.Sets/src/mage/cards/c/CreepingDread.java b/Mage.Sets/src/mage/cards/c/CreepingDread.java index 4c0bf2e06e7..5901c015034 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingDread.java +++ b/Mage.Sets/src/mage/cards/c/CreepingDread.java @@ -27,11 +27,6 @@ */ package mage.cards.c; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -47,6 +42,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.*; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/CreepingMold.java b/Mage.Sets/src/mage/cards/c/CreepingMold.java index c0e3a3e4b6b..9962534c138 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingMold.java +++ b/Mage.Sets/src/mage/cards/c/CreepingMold.java @@ -27,16 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CreepingRenaissance.java b/Mage.Sets/src/mage/cards/c/CreepingRenaissance.java index d247db3be7e..826a3a16828 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingRenaissance.java +++ b/Mage.Sets/src/mage/cards/c/CreepingRenaissance.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -39,9 +36,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java index 82a54a215a2..71ddd72841c 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java +++ b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java @@ -28,10 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,8 +38,13 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CreepyDoll.java b/Mage.Sets/src/mage/cards/c/CreepyDoll.java index 0edb690051a..3030bd371d5 100644 --- a/Mage.Sets/src/mage/cards/c/CreepyDoll.java +++ b/Mage.Sets/src/mage/cards/c/CreepyDoll.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.c; -import java.util.UUID; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -45,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/c/Cremate.java b/Mage.Sets/src/mage/cards/c/Cremate.java index 221ad8bedb4..e2c97457572 100644 --- a/Mage.Sets/src/mage/cards/c/Cremate.java +++ b/Mage.Sets/src/mage/cards/c/Cremate.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CrenellatedWall.java b/Mage.Sets/src/mage/cards/c/CrenellatedWall.java index 2b21360e87a..ec08f77c4de 100644 --- a/Mage.Sets/src/mage/cards/c/CrenellatedWall.java +++ b/Mage.Sets/src/mage/cards/c/CrenellatedWall.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CrescendoOfWar.java b/Mage.Sets/src/mage/cards/c/CrescendoOfWar.java index b74903663a0..ea9061f8c40 100644 --- a/Mage.Sets/src/mage/cards/c/CrescendoOfWar.java +++ b/Mage.Sets/src/mage/cards/c/CrescendoOfWar.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; @@ -44,6 +43,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterBlockingCreature; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrestedCraghorn.java b/Mage.Sets/src/mage/cards/c/CrestedCraghorn.java index be0706ba734..d678da401c1 100644 --- a/Mage.Sets/src/mage/cards/c/CrestedCraghorn.java +++ b/Mage.Sets/src/mage/cards/c/CrestedCraghorn.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ProvokeAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CribSwap.java b/Mage.Sets/src/mage/cards/c/CribSwap.java index 6369da8e1ca..42fbf9f6d68 100644 --- a/Mage.Sets/src/mage/cards/c/CribSwap.java +++ b/Mage.Sets/src/mage/cards/c/CribSwap.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -43,6 +42,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrimePunishment.java b/Mage.Sets/src/mage/cards/c/CrimePunishment.java index 0b18007a495..d301d9426de 100644 --- a/Mage.Sets/src/mage/cards/c/CrimePunishment.java +++ b/Mage.Sets/src/mage/cards/c/CrimePunishment.java @@ -28,7 +28,6 @@ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInOpponentsGraveyard; +import java.util.UUID; + public class CrimePunishment extends SplitCard { diff --git a/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java b/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java index 21904b99265..e75f0a133e7 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java b/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java index 2dda663b606..d0ee1ede87d 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.filter.FilterMana; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/c/CrimsonKobolds.java b/Mage.Sets/src/mage/cards/c/CrimsonKobolds.java index de6a512a0d9..3e2eab5662e 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonKobolds.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonKobolds.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMage.java b/Mage.Sets/src/mage/cards/c/CrimsonMage.java index 104bb4eba3c..a75de54af69 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMage.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMage.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,14 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CrimsonManticore.java b/Mage.Sets/src/mage/cards/c/CrimsonManticore.java index 912e1d3324d..34574ad0d8f 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonManticore.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonManticore.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java index b84d23a735b..d62d9d8d03a 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,9 +35,13 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceWhileControlsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CrimsonWisps.java b/Mage.Sets/src/mage/cards/c/CrimsonWisps.java index 61fbdc0a335..c3d7549d66a 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonWisps.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonWisps.java @@ -28,19 +28,19 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.BecomesColorTargetEffect; +import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/c/CripplingBlight.java b/Mage.Sets/src/mage/cards/c/CripplingBlight.java index 0f62a8aeb87..713cf97a816 100644 --- a/Mage.Sets/src/mage/cards/c/CripplingBlight.java +++ b/Mage.Sets/src/mage/cards/c/CripplingBlight.java @@ -27,12 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.combat.CantBlockAttachedEffect; @@ -40,9 +34,12 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CripplingChill.java b/Mage.Sets/src/mage/cards/c/CripplingChill.java index cecef94e75d..ebeea112068 100644 --- a/Mage.Sets/src/mage/cards/c/CripplingChill.java +++ b/Mage.Sets/src/mage/cards/c/CripplingChill.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.TapTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/c/CripplingFatigue.java b/Mage.Sets/src/mage/cards/c/CripplingFatigue.java index ae1acfe4220..1469cbfd756 100644 --- a/Mage.Sets/src/mage/cards/c/CripplingFatigue.java +++ b/Mage.Sets/src/mage/cards/c/CripplingFatigue.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Crocanura.java b/Mage.Sets/src/mage/cards/c/Crocanura.java index f9dabff880e..fc15e2a44a9 100644 --- a/Mage.Sets/src/mage/cards/c/Crocanura.java +++ b/Mage.Sets/src/mage/cards/c/Crocanura.java @@ -28,13 +28,14 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/Cromat.java b/Mage.Sets/src/mage/cards/c/Cromat.java index 91c71818848..6bb43d90f79 100644 --- a/Mage.Sets/src/mage/cards/c/Cromat.java +++ b/Mage.Sets/src/mage/cards/c/Cromat.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -49,6 +49,8 @@ import mage.filter.predicate.permanent.BlockedByIdPredicate; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +59,7 @@ public class Cromat extends CardImpl { public Cromat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Illusion"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/c/CrookclawTransmuter.java b/Mage.Sets/src/mage/cards/c/CrookclawTransmuter.java index 9f2da756694..34a85e185ef 100644 --- a/Mage.Sets/src/mage/cards/c/CrookclawTransmuter.java +++ b/Mage.Sets/src/mage/cards/c/CrookclawTransmuter.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrookshankKobolds.java b/Mage.Sets/src/mage/cards/c/CrookshankKobolds.java index a47718fef9c..5e91edd9aea 100644 --- a/Mage.Sets/src/mage/cards/c/CrookshankKobolds.java +++ b/Mage.Sets/src/mage/cards/c/CrookshankKobolds.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CropRotation.java b/Mage.Sets/src/mage/cards/c/CropRotation.java index cd6904c0db5..395902c4de5 100644 --- a/Mage.Sets/src/mage/cards/c/CropRotation.java +++ b/Mage.Sets/src/mage/cards/c/CropRotation.java @@ -27,19 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CropSigil.java b/Mage.Sets/src/mage/cards/c/CropSigil.java index 9d610ffe42c..e2cd542563c 100644 --- a/Mage.Sets/src/mage/cards/c/CropSigil.java +++ b/Mage.Sets/src/mage/cards/c/CropSigil.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.condition.common.DeliriumCondition; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.events.GameEvent; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrosisThePurger.java b/Mage.Sets/src/mage/cards/c/CrosisThePurger.java index 0937de79d4e..2cba340eb76 100644 --- a/Mage.Sets/src/mage/cards/c/CrosisThePurger.java +++ b/Mage.Sets/src/mage/cards/c/CrosisThePurger.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -44,11 +41,16 @@ import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LoneFox @@ -58,7 +60,7 @@ public class CrosisThePurger extends CardImpl { public CrosisThePurger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/c/CrosissAttendant.java b/Mage.Sets/src/mage/cards/c/CrosissAttendant.java index 7829eb4a660..27aac33ba03 100644 --- a/Mage.Sets/src/mage/cards/c/CrosissAttendant.java +++ b/Mage.Sets/src/mage/cards/c/CrosissAttendant.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CrosissCatacombs.java b/Mage.Sets/src/mage/cards/c/CrosissCatacombs.java index 24e0d4e0a11..2b111670462 100644 --- a/Mage.Sets/src/mage/cards/c/CrosissCatacombs.java +++ b/Mage.Sets/src/mage/cards/c/CrosissCatacombs.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CrosissCharm.java b/Mage.Sets/src/mage/cards/c/CrosissCharm.java index 411ff825626..7be4b2f3e75 100644 --- a/Mage.Sets/src/mage/cards/c/CrosissCharm.java +++ b/Mage.Sets/src/mage/cards/c/CrosissCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; @@ -43,6 +42,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrossbowAmbush.java b/Mage.Sets/src/mage/cards/c/CrossbowAmbush.java index c9f52dde8d4..a1261bd1dec 100644 --- a/Mage.Sets/src/mage/cards/c/CrossbowAmbush.java +++ b/Mage.Sets/src/mage/cards/c/CrossbowAmbush.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java b/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java index 5f9c31f2a40..d0318dd205f 100644 --- a/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java +++ b/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +34,12 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/Crossfire.java b/Mage.Sets/src/mage/cards/c/Crossfire.java index 2760cf41e8c..7366556cc61 100644 --- a/Mage.Sets/src/mage/cards/c/Crossfire.java +++ b/Mage.Sets/src/mage/cards/c/Crossfire.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java b/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java index f85e14109e5..dc11058efe5 100644 --- a/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java +++ b/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrosswayVampire.java b/Mage.Sets/src/mage/cards/c/CrosswayVampire.java index 8dff15d967e..009ebf04cf5 100644 --- a/Mage.Sets/src/mage/cards/c/CrosswayVampire.java +++ b/Mage.Sets/src/mage/cards/c/CrosswayVampire.java @@ -27,17 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/Crosswinds.java b/Mage.Sets/src/mage/cards/c/Crosswinds.java index 72a10e0bee3..745ece23381 100644 --- a/Mage.Sets/src/mage/cards/c/Crosswinds.java +++ b/Mage.Sets/src/mage/cards/c/Crosswinds.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.FlyingAbility; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author hanasu diff --git a/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java b/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java index 2043d1fb1e0..1f20c1adea0 100644 --- a/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java +++ b/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +36,16 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Loki @@ -60,7 +61,7 @@ public class CrovaxAscendantHero extends CardImpl { public CrovaxAscendantHero(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java b/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java index 51b4bf7cfda..fdb92e9d777 100644 --- a/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java +++ b/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,17 +40,15 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +57,7 @@ public class CrovaxTheCursed extends CardImpl { public CrovaxTheCursed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/c/CrowOfDarkTidings.java b/Mage.Sets/src/mage/cards/c/CrowOfDarkTidings.java index a5ef620a608..6d7e57f17eb 100644 --- a/Mage.Sets/src/mage/cards/c/CrowOfDarkTidings.java +++ b/Mage.Sets/src/mage/cards/c/CrowOfDarkTidings.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldOrDiesSourceTriggeredAbility; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrowdFavorites.java b/Mage.Sets/src/mage/cards/c/CrowdFavorites.java index 4fb7f352027..2dda4d0fd3c 100644 --- a/Mage.Sets/src/mage/cards/c/CrowdFavorites.java +++ b/Mage.Sets/src/mage/cards/c/CrowdFavorites.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CrowdOfCinders.java b/Mage.Sets/src/mage/cards/c/CrowdOfCinders.java index fe1210fb38d..94825fcf643 100644 --- a/Mage.Sets/src/mage/cards/c/CrowdOfCinders.java +++ b/Mage.Sets/src/mage/cards/c/CrowdOfCinders.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -39,9 +35,14 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CrowdsFavor.java b/Mage.Sets/src/mage/cards/c/CrowdsFavor.java index 97f5f719db0..9b08fb83f4f 100644 --- a/Mage.Sets/src/mage/cards/c/CrowdsFavor.java +++ b/Mage.Sets/src/mage/cards/c/CrowdsFavor.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/c/CrownHunterHireling.java b/Mage.Sets/src/mage/cards/c/CrownHunterHireling.java index 3541708d15a..37a3ad0d264 100644 --- a/Mage.Sets/src/mage/cards/c/CrownHunterHireling.java +++ b/Mage.Sets/src/mage/cards/c/CrownHunterHireling.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java index 0e3779a2463..745f4d4b785 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java @@ -39,7 +39,10 @@ import mage.abilities.effects.common.continuous.PlayWithTheTopCardRevealedEffect import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/c/CrownOfDoom.java b/Mage.Sets/src/mage/cards/c/CrownOfDoom.java index 7595fbc035a..3463b77b859 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfDoom.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfDoom.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.AttacksAllTriggeredAbility; @@ -42,11 +40,7 @@ import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPlayer; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -56,6 +50,9 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java b/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java index 2745098eb91..006b77e03eb 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/c/CrownOfFlames.java b/Mage.Sets/src/mage/cards/c/CrownOfFlames.java index 0b77a342d42..244bc140f12 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfFlames.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfFlames.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -39,9 +36,12 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java index 5ab8b1c698d..c90707cd962 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -51,6 +50,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/CrownedCeratok.java b/Mage.Sets/src/mage/cards/c/CrownedCeratok.java index 233f28bfd09..5fd486c9e13 100644 --- a/Mage.Sets/src/mage/cards/c/CrownedCeratok.java +++ b/Mage.Sets/src/mage/cards/c/CrownedCeratok.java @@ -27,22 +27,23 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java index cb29002d5c6..97577a1234e 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java @@ -27,17 +27,20 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java b/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java index 2f39cf238d8..82e816936ea 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ConditionalMana; import mage.MageObject; import mage.Mana; @@ -49,6 +48,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrucibleOfWorlds.java b/Mage.Sets/src/mage/cards/c/CrucibleOfWorlds.java index 4a9d007c724..225c14bc19d 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfWorlds.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfWorlds.java @@ -27,13 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.PlayLandAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,9 +34,12 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CrudeRampart.java b/Mage.Sets/src/mage/cards/c/CrudeRampart.java index fc62a536940..2c6120a7dd0 100644 --- a/Mage.Sets/src/mage/cards/c/CrudeRampart.java +++ b/Mage.Sets/src/mage/cards/c/CrudeRampart.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.DefenderAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CruelDeceiver.java b/Mage.Sets/src/mage/cards/c/CruelDeceiver.java index 833a7b908df..53cb4363d7e 100644 --- a/Mage.Sets/src/mage/cards/c/CruelDeceiver.java +++ b/Mage.Sets/src/mage/cards/c/CruelDeceiver.java @@ -27,11 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -43,14 +38,16 @@ import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CruelEdict.java b/Mage.Sets/src/mage/cards/c/CruelEdict.java index afee4ffce89..928e7ca0090 100644 --- a/Mage.Sets/src/mage/cards/c/CruelEdict.java +++ b/Mage.Sets/src/mage/cards/c/CruelEdict.java @@ -27,14 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CruelEntertainment.java b/Mage.Sets/src/mage/cards/c/CruelEntertainment.java index e15e4278481..ce18b633726 100644 --- a/Mage.Sets/src/mage/cards/c/CruelEntertainment.java +++ b/Mage.Sets/src/mage/cards/c/CruelEntertainment.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.turn.TurnMod; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CruelFeeding.java b/Mage.Sets/src/mage/cards/c/CruelFeeding.java index 9cf4d918353..de19c7cd879 100644 --- a/Mage.Sets/src/mage/cards/c/CruelFeeding.java +++ b/Mage.Sets/src/mage/cards/c/CruelFeeding.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.abilityword.StriveAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CruelFinality.java b/Mage.Sets/src/mage/cards/c/CruelFinality.java index bc0e2df311a..6b880662fb6 100644 --- a/Mage.Sets/src/mage/cards/c/CruelFinality.java +++ b/Mage.Sets/src/mage/cards/c/CruelFinality.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CruelRevival.java b/Mage.Sets/src/mage/cards/c/CruelRevival.java index 5eab562d68e..581a3b0307f 100644 --- a/Mage.Sets/src/mage/cards/c/CruelRevival.java +++ b/Mage.Sets/src/mage/cards/c/CruelRevival.java @@ -27,14 +27,12 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; @@ -47,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CruelSadist.java b/Mage.Sets/src/mage/cards/c/CruelSadist.java index 461b3940175..41130e693fb 100644 --- a/Mage.Sets/src/mage/cards/c/CruelSadist.java +++ b/Mage.Sets/src/mage/cards/c/CruelSadist.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CruelTutor.java b/Mage.Sets/src/mage/cards/c/CruelTutor.java index 4743137667d..7a59a0cb9ce 100644 --- a/Mage.Sets/src/mage/cards/c/CruelTutor.java +++ b/Mage.Sets/src/mage/cards/c/CruelTutor.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.CardImpl; @@ -36,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/c/CruelUltimatum.java b/Mage.Sets/src/mage/cards/c/CruelUltimatum.java index 5ab32d37e6f..411a9b7d3d2 100644 --- a/Mage.Sets/src/mage/cards/c/CruelUltimatum.java +++ b/Mage.Sets/src/mage/cards/c/CruelUltimatum.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CrueltyOfTheSith.java b/Mage.Sets/src/mage/cards/c/CrueltyOfTheSith.java index b7ed1d218c0..07f692dbac3 100644 --- a/Mage.Sets/src/mage/cards/c/CrueltyOfTheSith.java +++ b/Mage.Sets/src/mage/cards/c/CrueltyOfTheSith.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPlayer; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/Crumble.java b/Mage.Sets/src/mage/cards/c/Crumble.java index c6defbaede2..1da9e7400f6 100644 --- a/Mage.Sets/src/mage/cards/c/Crumble.java +++ b/Mage.Sets/src/mage/cards/c/Crumble.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrumbleToDust.java b/Mage.Sets/src/mage/cards/c/CrumbleToDust.java index 18ac2ff2329..54cd449bf3e 100644 --- a/Mage.Sets/src/mage/cards/c/CrumbleToDust.java +++ b/Mage.Sets/src/mage/cards/c/CrumbleToDust.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.common.ExileTargetAndSearchGraveyardHandLibraryEffect; import mage.abilities.keyword.DevoidAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrumblingAshes.java b/Mage.Sets/src/mage/cards/c/CrumblingAshes.java index 119bcc32230..d71ce8ef940 100644 --- a/Mage.Sets/src/mage/cards/c/CrumblingAshes.java +++ b/Mage.Sets/src/mage/cards/c/CrumblingAshes.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.permanent.CounterPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CrumblingColossus.java b/Mage.Sets/src/mage/cards/c/CrumblingColossus.java index e7976d89f0f..222a8bad095 100644 --- a/Mage.Sets/src/mage/cards/c/CrumblingColossus.java +++ b/Mage.Sets/src/mage/cards/c/CrumblingColossus.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; @@ -36,6 +35,7 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CrumblingNecropolis.java b/Mage.Sets/src/mage/cards/c/CrumblingNecropolis.java index 8a051559b7e..f5451f63c33 100644 --- a/Mage.Sets/src/mage/cards/c/CrumblingNecropolis.java +++ b/Mage.Sets/src/mage/cards/c/CrumblingNecropolis.java @@ -28,14 +28,15 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java b/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java index 87b02ed31b8..34caf38ff17 100644 --- a/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java +++ b/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CrumblingVestige.java b/Mage.Sets/src/mage/cards/c/CrumblingVestige.java index d6613e7d5cf..21722ddbccf 100644 --- a/Mage.Sets/src/mage/cards/c/CrumblingVestige.java +++ b/Mage.Sets/src/mage/cards/c/CrumblingVestige.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.AddManaOfAnyColorEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Crusade.java b/Mage.Sets/src/mage/cards/c/Crusade.java index 5c3a5c29be0..90a91dc229b 100644 --- a/Mage.Sets/src/mage/cards/c/Crusade.java +++ b/Mage.Sets/src/mage/cards/c/Crusade.java @@ -27,18 +27,19 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North, Loki diff --git a/Mage.Sets/src/mage/cards/c/CrusaderOfOdric.java b/Mage.Sets/src/mage/cards/c/CrusaderOfOdric.java index fd01e71db69..63d4ac81f93 100644 --- a/Mage.Sets/src/mage/cards/c/CrusaderOfOdric.java +++ b/Mage.Sets/src/mage/cards/c/CrusaderOfOdric.java @@ -27,19 +27,19 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java index 8d3924408c9..e0cfb75341f 100644 --- a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java +++ b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -36,11 +35,16 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/c/Crush.java b/Mage.Sets/src/mage/cards/c/Crush.java index 8c44ae1ea63..95e3b143733 100644 --- a/Mage.Sets/src/mage/cards/c/Crush.java +++ b/Mage.Sets/src/mage/cards/c/Crush.java @@ -27,16 +27,17 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CrushOfTentacles.java b/Mage.Sets/src/mage/cards/c/CrushOfTentacles.java index d506b7cb293..bbf0db71dc7 100644 --- a/Mage.Sets/src/mage/cards/c/CrushOfTentacles.java +++ b/Mage.Sets/src/mage/cards/c/CrushOfTentacles.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.condition.common.SurgedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.filter.common.FilterNonlandPermanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java b/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java index c31848b58e3..3832a0d606d 100644 --- a/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java +++ b/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -44,6 +43,8 @@ import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java index 3f65a861971..956dabca713 100644 --- a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -41,10 +38,16 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CrushingPain.java b/Mage.Sets/src/mage/cards/c/CrushingPain.java index d1d9253042b..c660d6f127e 100644 --- a/Mage.Sets/src/mage/cards/c/CrushingPain.java +++ b/Mage.Sets/src/mage/cards/c/CrushingPain.java @@ -29,16 +29,16 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/c/CrushingVines.java b/Mage.Sets/src/mage/cards/c/CrushingVines.java index 7a206021d04..eb0d4f20f3a 100644 --- a/Mage.Sets/src/mage/cards/c/CrushingVines.java +++ b/Mage.Sets/src/mage/cards/c/CrushingVines.java @@ -27,18 +27,19 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CruxOfFate.java b/Mage.Sets/src/mage/cards/c/CruxOfFate.java index 140e32d256e..ac387dcf829 100644 --- a/Mage.Sets/src/mage/cards/c/CruxOfFate.java +++ b/Mage.Sets/src/mage/cards/c/CruxOfFate.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CryOfContrition.java b/Mage.Sets/src/mage/cards/c/CryOfContrition.java index a53b5a218a0..b39a1442578 100644 --- a/Mage.Sets/src/mage/cards/c/CryOfContrition.java +++ b/Mage.Sets/src/mage/cards/c/CryOfContrition.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Cryoclasm.java b/Mage.Sets/src/mage/cards/c/Cryoclasm.java index a84d0892d1a..7fa93259469 100644 --- a/Mage.Sets/src/mage/cards/c/Cryoclasm.java +++ b/Mage.Sets/src/mage/cards/c/Cryoclasm.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetControllerEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/c/Crypsis.java b/Mage.Sets/src/mage/cards/c/Crypsis.java index 0e4c60718fc..e73be9e5c9e 100644 --- a/Mage.Sets/src/mage/cards/c/Crypsis.java +++ b/Mage.Sets/src/mage/cards/c/Crypsis.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CryptAngel.java b/Mage.Sets/src/mage/cards/c/CryptAngel.java index f4d87d3a37d..b2c6660fcd7 100644 --- a/Mage.Sets/src/mage/cards/c/CryptAngel.java +++ b/Mage.Sets/src/mage/cards/c/CryptAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CryptChampion.java b/Mage.Sets/src/mage/cards/c/CryptChampion.java index 6b14c8187ba..884756836a2 100644 --- a/Mage.Sets/src/mage/cards/c/CryptChampion.java +++ b/Mage.Sets/src/mage/cards/c/CryptChampion.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -53,6 +52,8 @@ import mage.target.Target; import mage.target.common.TargetCardInGraveyard; import mage.watchers.common.ManaSpentToCastWatcher; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CryptCobra.java b/Mage.Sets/src/mage/cards/c/CryptCobra.java index c7d11596b5d..b28944b6538 100644 --- a/Mage.Sets/src/mage/cards/c/CryptCobra.java +++ b/Mage.Sets/src/mage/cards/c/CryptCobra.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; import mage.abilities.effects.Effect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CryptCreeper.java b/Mage.Sets/src/mage/cards/c/CryptCreeper.java index 47ab7aa1c2b..7e28f256ea7 100644 --- a/Mage.Sets/src/mage/cards/c/CryptCreeper.java +++ b/Mage.Sets/src/mage/cards/c/CryptCreeper.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -35,6 +34,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/c/CryptGhast.java b/Mage.Sets/src/mage/cards/c/CryptGhast.java index 9db501bd276..0af2538e3e2 100644 --- a/Mage.Sets/src/mage/cards/c/CryptGhast.java +++ b/Mage.Sets/src/mage/cards/c/CryptGhast.java @@ -28,7 +28,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CryptIncursion.java b/Mage.Sets/src/mage/cards/c/CryptIncursion.java index f5243b0cd89..0c593208040 100644 --- a/Mage.Sets/src/mage/cards/c/CryptIncursion.java +++ b/Mage.Sets/src/mage/cards/c/CryptIncursion.java @@ -28,19 +28,20 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CryptOfAgadeem.java b/Mage.Sets/src/mage/cards/c/CryptOfAgadeem.java index 4ef17497fdd..fcf80011b94 100644 --- a/Mage.Sets/src/mage/cards/c/CryptOfAgadeem.java +++ b/Mage.Sets/src/mage/cards/c/CryptOfAgadeem.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -39,9 +37,12 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CryptRats.java b/Mage.Sets/src/mage/cards/c/CryptRats.java index 50bc847f6c4..aa7f840dd3a 100644 --- a/Mage.Sets/src/mage/cards/c/CryptRats.java +++ b/Mage.Sets/src/mage/cards/c/CryptRats.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.FilterMana; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CryptRipper.java b/Mage.Sets/src/mage/cards/c/CryptRipper.java index befec2faf3d..5fa3b504b01 100644 --- a/Mage.Sets/src/mage/cards/c/CryptRipper.java +++ b/Mage.Sets/src/mage/cards/c/CryptRipper.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +34,11 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CryptSliver.java b/Mage.Sets/src/mage/cards/c/CryptSliver.java index 4d2f3b5c159..eaf7b709dde 100644 --- a/Mage.Sets/src/mage/cards/c/CryptSliver.java +++ b/Mage.Sets/src/mage/cards/c/CryptSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CryptbornHorror.java b/Mage.Sets/src/mage/cards/c/CryptbornHorror.java index 24be98a363c..b415d3f0a75 100644 --- a/Mage.Sets/src/mage/cards/c/CryptbornHorror.java +++ b/Mage.Sets/src/mage/cards/c/CryptbornHorror.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java index e568b0bbe3a..cf799bf3724 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java +++ b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -50,6 +49,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrypticAnnelid.java b/Mage.Sets/src/mage/cards/c/CrypticAnnelid.java index 3b31fb83927..ed71bc02895 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticAnnelid.java +++ b/Mage.Sets/src/mage/cards/c/CrypticAnnelid.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CrypticCommand.java b/Mage.Sets/src/mage/cards/c/CrypticCommand.java index ed229e65549..3f372125124 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticCommand.java +++ b/Mage.Sets/src/mage/cards/c/CrypticCommand.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/c/CrypticCruiser.java b/Mage.Sets/src/mage/cards/c/CrypticCruiser.java index 1d587f23eed..552ba56cd31 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticCruiser.java +++ b/Mage.Sets/src/mage/cards/c/CrypticCruiser.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrypticGateway.java b/Mage.Sets/src/mage/cards/c/CrypticGateway.java index 741baef9685..beca9ec21b3 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticGateway.java +++ b/Mage.Sets/src/mage/cards/c/CrypticGateway.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -54,6 +51,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/c/CryptolithFragment.java b/Mage.Sets/src/mage/cards/c/CryptolithFragment.java index 7487ef139b4..958f22f128e 100644 --- a/Mage.Sets/src/mage/cards/c/CryptolithFragment.java +++ b/Mage.Sets/src/mage/cards/c/CryptolithFragment.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -37,12 +36,14 @@ import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.abilities.mana.AnyColorManaAbility; -import mage.cards.a.AuroraOfEmrakul; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.a.AuroraOfEmrakul; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CryptolithRite.java b/Mage.Sets/src/mage/cards/c/CryptolithRite.java index aa291b51af5..616c966a9a9 100644 --- a/Mage.Sets/src/mage/cards/c/CryptolithRite.java +++ b/Mage.Sets/src/mage/cards/c/CryptolithRite.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.mana.AnyColorManaAbility; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/Cryptoplasm.java b/Mage.Sets/src/mage/cards/c/Cryptoplasm.java index c64a456e604..9ce1d174c46 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptoplasm.java +++ b/Mage.Sets/src/mage/cards/c/Cryptoplasm.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.util.functions.ApplyToPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/c/CrystalBall.java b/Mage.Sets/src/mage/cards/c/CrystalBall.java index 2c9fb2deec0..61231113362 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalBall.java +++ b/Mage.Sets/src/mage/cards/c/CrystalBall.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +35,10 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CrystalChimes.java b/Mage.Sets/src/mage/cards/c/CrystalChimes.java index 6bef60e4d50..94591256633 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalChimes.java +++ b/Mage.Sets/src/mage/cards/c/CrystalChimes.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -43,6 +42,8 @@ import mage.filter.common.FilterEnchantmentCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrystalGolem.java b/Mage.Sets/src/mage/cards/c/CrystalGolem.java index 6b3a8b0e677..5135788f36b 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalGolem.java +++ b/Mage.Sets/src/mage/cards/c/CrystalGolem.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.PhaseOutSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrystalQuarry.java b/Mage.Sets/src/mage/cards/c/CrystalQuarry.java index f209a46e9e5..a9908fde53f 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalQuarry.java +++ b/Mage.Sets/src/mage/cards/c/CrystalQuarry.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CrystalRod.java b/Mage.Sets/src/mage/cards/c/CrystalRod.java index 46eb132f01c..0690cde1981 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalRod.java +++ b/Mage.Sets/src/mage/cards/c/CrystalRod.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/c/CrystalSeer.java b/Mage.Sets/src/mage/cards/c/CrystalSeer.java index dc5512f3cfd..83bf3134439 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalSeer.java +++ b/Mage.Sets/src/mage/cards/c/CrystalSeer.java @@ -29,9 +29,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +37,10 @@ import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CrystalShard.java b/Mage.Sets/src/mage/cards/c/CrystalShard.java index 5dc069dcb88..7cd173945c8 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalShard.java +++ b/Mage.Sets/src/mage/cards/c/CrystalShard.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrystalVein.java b/Mage.Sets/src/mage/cards/c/CrystalVein.java index e7494bd51ce..4acd4e44664 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalVein.java +++ b/Mage.Sets/src/mage/cards/c/CrystalVein.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java b/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java index f93601c1add..c26e1a37d34 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java b/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java index 6d6dca9d8d4..3ffb74474ad 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTargetTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CrystallineSliver.java b/Mage.Sets/src/mage/cards/c/CrystallineSliver.java index f3c5c3b7d08..abe0cc4d717 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineSliver.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/Crystallization.java b/Mage.Sets/src/mage/cards/c/Crystallization.java index 80ca4dc990e..af8af13ae20 100644 --- a/Mage.Sets/src/mage/cards/c/Crystallization.java +++ b/Mage.Sets/src/mage/cards/c/Crystallization.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -49,6 +48,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CudgelTroll.java b/Mage.Sets/src/mage/cards/c/CudgelTroll.java index 7c98d24c929..3cdf5806631 100644 --- a/Mage.Sets/src/mage/cards/c/CudgelTroll.java +++ b/Mage.Sets/src/mage/cards/c/CudgelTroll.java @@ -28,15 +28,16 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CullingDais.java b/Mage.Sets/src/mage/cards/c/CullingDais.java index 96527bd3914..94d5d2151ca 100644 --- a/Mage.Sets/src/mage/cards/c/CullingDais.java +++ b/Mage.Sets/src/mage/cards/c/CullingDais.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +38,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.counters.CounterType; @@ -49,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CullingDrone.java b/Mage.Sets/src/mage/cards/c/CullingDrone.java index 1ff868f07a7..5a222638e25 100644 --- a/Mage.Sets/src/mage/cards/c/CullingDrone.java +++ b/Mage.Sets/src/mage/cards/c/CullingDrone.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DevoidAbility; import mage.abilities.keyword.IngestAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CullingMark.java b/Mage.Sets/src/mage/cards/c/CullingMark.java index 230c07d317a..e786adc9187 100644 --- a/Mage.Sets/src/mage/cards/c/CullingMark.java +++ b/Mage.Sets/src/mage/cards/c/CullingMark.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.combat.BlocksIfAbleTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CullingScales.java b/Mage.Sets/src/mage/cards/c/CullingScales.java index 42456b8a28b..a5bc9e73866 100644 --- a/Mage.Sets/src/mage/cards/c/CullingScales.java +++ b/Mage.Sets/src/mage/cards/c/CullingScales.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author cg5 diff --git a/Mage.Sets/src/mage/cards/c/CullingSun.java b/Mage.Sets/src/mage/cards/c/CullingSun.java index dcc71d7fe10..5bbab7b35c6 100644 --- a/Mage.Sets/src/mage/cards/c/CullingSun.java +++ b/Mage.Sets/src/mage/cards/c/CullingSun.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CullingTheWeak.java b/Mage.Sets/src/mage/cards/c/CullingTheWeak.java index 4ba307f21cd..435b45cba5a 100644 --- a/Mage.Sets/src/mage/cards/c/CullingTheWeak.java +++ b/Mage.Sets/src/mage/cards/c/CullingTheWeak.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.Mana; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.BasicManaEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java b/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java index c208ff6d366..4de9acd7ce5 100644 --- a/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java +++ b/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.permanent.token.WolfToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CultbrandCinder.java b/Mage.Sets/src/mage/cards/c/CultbrandCinder.java index bc236333c67..e0a15a97f2b 100644 --- a/Mage.Sets/src/mage/cards/c/CultbrandCinder.java +++ b/Mage.Sets/src/mage/cards/c/CultbrandCinder.java @@ -27,17 +27,18 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CultistsStaff.java b/Mage.Sets/src/mage/cards/c/CultistsStaff.java index 0397ddac934..af135dd6f94 100644 --- a/Mage.Sets/src/mage/cards/c/CultistsStaff.java +++ b/Mage.Sets/src/mage/cards/c/CultistsStaff.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -39,6 +38,8 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/c/Cultivate.java b/Mage.Sets/src/mage/cards/c/Cultivate.java index b50d86bba98..c25599b0a82 100644 --- a/Mage.Sets/src/mage/cards/c/Cultivate.java +++ b/Mage.Sets/src/mage/cards/c/Cultivate.java @@ -27,15 +27,10 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -46,6 +41,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CultivatorDrone.java b/Mage.Sets/src/mage/cards/c/CultivatorDrone.java index 374de5a6bf8..a442bb9da05 100644 --- a/Mage.Sets/src/mage/cards/c/CultivatorDrone.java +++ b/Mage.Sets/src/mage/cards/c/CultivatorDrone.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ConditionalMana; import mage.MageInt; import mage.MageObject; @@ -49,6 +48,8 @@ import mage.constants.CardType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CultivatorOfBlades.java b/Mage.Sets/src/mage/cards/c/CultivatorOfBlades.java index 088b1aec937..cc17f83a64a 100644 --- a/Mage.Sets/src/mage/cards/c/CultivatorOfBlades.java +++ b/Mage.Sets/src/mage/cards/c/CultivatorOfBlades.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CultivatorsCaravan.java b/Mage.Sets/src/mage/cards/c/CultivatorsCaravan.java index 7e80b8f579a..e8177331aa0 100644 --- a/Mage.Sets/src/mage/cards/c/CultivatorsCaravan.java +++ b/Mage.Sets/src/mage/cards/c/CultivatorsCaravan.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.CrewAbility; import mage.abilities.mana.AnyColorManaAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CumberStone.java b/Mage.Sets/src/mage/cards/c/CumberStone.java index 9f7d00bad5f..608454076fa 100644 --- a/Mage.Sets/src/mage/cards/c/CumberStone.java +++ b/Mage.Sets/src/mage/cards/c/CumberStone.java @@ -27,16 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CunningAbduction.java b/Mage.Sets/src/mage/cards/c/CunningAbduction.java index 0851fcfb21f..468e3ecf4cc 100644 --- a/Mage.Sets/src/mage/cards/c/CunningAbduction.java +++ b/Mage.Sets/src/mage/cards/c/CunningAbduction.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; @@ -37,12 +36,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.ManaType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterNonlandCard; import mage.game.Game; import mage.players.ManaPoolItem; @@ -52,6 +46,8 @@ import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/c/CunningAdvisor.java b/Mage.Sets/src/mage/cards/c/CunningAdvisor.java index 13099b1d383..8bb27106244 100644 --- a/Mage.Sets/src/mage/cards/c/CunningAdvisor.java +++ b/Mage.Sets/src/mage/cards/c/CunningAdvisor.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CunningBandit.java b/Mage.Sets/src/mage/cards/c/CunningBandit.java index 1df46cfe346..d14a9031756 100644 --- a/Mage.Sets/src/mage/cards/c/CunningBandit.java +++ b/Mage.Sets/src/mage/cards/c/CunningBandit.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -43,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -50,6 +50,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -92,7 +94,7 @@ class AzamukiTreacheryIncarnate extends Token { AzamukiTreacheryIncarnate() { super("Azamuki, Treachery Incarnate", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/c/CunningBreezedancer.java b/Mage.Sets/src/mage/cards/c/CunningBreezedancer.java index 7d480f9661e..9234b3b7e0f 100644 --- a/Mage.Sets/src/mage/cards/c/CunningBreezedancer.java +++ b/Mage.Sets/src/mage/cards/c/CunningBreezedancer.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -40,6 +39,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CunningLethemancer.java b/Mage.Sets/src/mage/cards/c/CunningLethemancer.java index 66f4fd2b47e..a11ea1d5cb0 100644 --- a/Mage.Sets/src/mage/cards/c/CunningLethemancer.java +++ b/Mage.Sets/src/mage/cards/c/CunningLethemancer.java @@ -27,15 +27,16 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CunningSparkmage.java b/Mage.Sets/src/mage/cards/c/CunningSparkmage.java index fba0d68db5b..78401d3dbfc 100644 --- a/Mage.Sets/src/mage/cards/c/CunningSparkmage.java +++ b/Mage.Sets/src/mage/cards/c/CunningSparkmage.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,12 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CunningStrike.java b/Mage.Sets/src/mage/cards/c/CunningStrike.java index 22eac92fa34..f6b2aa93111 100644 --- a/Mage.Sets/src/mage/cards/c/CunningStrike.java +++ b/Mage.Sets/src/mage/cards/c/CunningStrike.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -39,6 +38,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CunningWish.java b/Mage.Sets/src/mage/cards/c/CunningWish.java index 23a2e3aaef2..0a526ea10df 100644 --- a/Mage.Sets/src/mage/cards/c/CunningWish.java +++ b/Mage.Sets/src/mage/cards/c/CunningWish.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.WishEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java index 74047137f92..509bbcd4f83 100644 --- a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java +++ b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/Curfew.java b/Mage.Sets/src/mage/cards/c/Curfew.java index 11c06ac8c42..5586c30cc10 100644 --- a/Mage.Sets/src/mage/cards/c/Curfew.java +++ b/Mage.Sets/src/mage/cards/c/Curfew.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.List; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -44,6 +41,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.List; +import java.util.UUID; + /** * * @author maxlebedev diff --git a/Mage.Sets/src/mage/cards/c/CurioVendor.java b/Mage.Sets/src/mage/cards/c/CurioVendor.java index ef599e65948..3efba6ce768 100644 --- a/Mage.Sets/src/mage/cards/c/CurioVendor.java +++ b/Mage.Sets/src/mage/cards/c/CurioVendor.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/Curiosity.java b/Mage.Sets/src/mage/cards/c/Curiosity.java index ed2e5eeb434..4345051da81 100644 --- a/Mage.Sets/src/mage/cards/c/Curiosity.java +++ b/Mage.Sets/src/mage/cards/c/Curiosity.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Alvin, noxx diff --git a/Mage.Sets/src/mage/cards/c/CuriousHomunculus.java b/Mage.Sets/src/mage/cards/c/CuriousHomunculus.java index 976f6dee0d2..250cbd448c1 100644 --- a/Mage.Sets/src/mage/cards/c/CuriousHomunculus.java +++ b/Mage.Sets/src/mage/cards/c/CuriousHomunculus.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ConditionalMana; import mage.MageInt; import mage.MageObject; @@ -44,15 +43,17 @@ import mage.abilities.keyword.TransformAbility; import mage.abilities.mana.ConditionalColorlessManaAbility; import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.abilities.mana.conditional.ManaCondition; -import mage.cards.v.VoraciousReader; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.v.VoraciousReader; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterInstantOrSorceryCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java b/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java index b2c1f194dcc..a5312ac985d 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfChains.java b/Mage.Sets/src/mage/cards/c/CurseOfChains.java index fae3ee3e1d1..9d7678d2d48 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfChains.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfChains.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,6 +40,8 @@ import mage.constants.TargetController; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CurseOfChaos.java b/Mage.Sets/src/mage/cards/c/CurseOfChaos.java index 3889b540bcc..19bc8f85dd4 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfChaos.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfChaos.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java b/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java index c85f813e852..1de026c6f8a 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; @@ -50,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java b/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java index 547a27e1a0e..0556bce5c12 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -44,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.watchers.common.CastSpellLastTurnWatcher; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfInertia.java b/Mage.Sets/src/mage/cards/c/CurseOfInertia.java index 5e02adfbf82..6360763e591 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfInertia.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfInertia.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java b/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java index 9b511d45965..4f454d2ae88 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java b/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java index 7f4ec82d287..d1f1eb3bbb4 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -38,6 +35,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; @@ -52,6 +50,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java b/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java index 41895c651c2..b1ba0793891 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfPredation.java b/Mage.Sets/src/mage/cards/c/CurseOfPredation.java index e3023e34520..abef087ab76 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfPredation.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfPredation.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java b/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java index 5e68c8edd3c..d0d2bcad381 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; @@ -50,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CurseOfStalkedPrey.java b/Mage.Sets/src/mage/cards/c/CurseOfStalkedPrey.java index e7e96aa8379..007c9739ec8 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfStalkedPrey.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfStalkedPrey.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java index 7cc8dc4894f..11fb023c228 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Alvin diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java b/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java index 9f995b7e9cc..5899539f0a7 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheNightlyHunt.java b/Mage.Sets/src/mage/cards/c/CurseOfTheNightlyHunt.java index a2ddf79f147..cbe8bc138a3 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheNightlyHunt.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheNightlyHunt.java @@ -27,11 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RequirementEffect; @@ -39,10 +34,16 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java index f47cc7c8fcd..8803c631057 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.AttachEffect; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java b/Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java index 3e74fed5fe4..6bd976bec8b 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThirst.java b/Mage.Sets/src/mage/cards/c/CurseOfThirst.java index 90def2e24c5..653c7beb9f0 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfThirst.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfThirst.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.DynamicValue; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/c/CurseOfWizardry.java b/Mage.Sets/src/mage/cards/c/CurseOfWizardry.java index 86abd40f219..e7f1b993f5d 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfWizardry.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfWizardry.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author jeffwadsworth */ diff --git a/Mage.Sets/src/mage/cards/c/Cursebreak.java b/Mage.Sets/src/mage/cards/c/Cursebreak.java index 1bc8286cfe9..9056ee035e4 100644 --- a/Mage.Sets/src/mage/cards/c/Cursebreak.java +++ b/Mage.Sets/src/mage/cards/c/Cursebreak.java @@ -27,11 +27,11 @@ */ package mage.cards.c; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/Cursecatcher.java b/Mage.Sets/src/mage/cards/c/Cursecatcher.java index ce1361a401e..78352a704d0 100644 --- a/Mage.Sets/src/mage/cards/c/Cursecatcher.java +++ b/Mage.Sets/src/mage/cards/c/Cursecatcher.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -37,11 +34,15 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/c/CursedFlesh.java b/Mage.Sets/src/mage/cards/c/CursedFlesh.java index 4c204200e3c..eab166a32f0 100644 --- a/Mage.Sets/src/mage/cards/c/CursedFlesh.java +++ b/Mage.Sets/src/mage/cards/c/CursedFlesh.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,14 +36,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/c/CursedLand.java b/Mage.Sets/src/mage/cards/c/CursedLand.java index 947175a62bb..b872850ab64 100644 --- a/Mage.Sets/src/mage/cards/c/CursedLand.java +++ b/Mage.Sets/src/mage/cards/c/CursedLand.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CursedMonstrosity.java b/Mage.Sets/src/mage/cards/c/CursedMonstrosity.java index 990392fca98..d76b4806531 100644 --- a/Mage.Sets/src/mage/cards/c/CursedMonstrosity.java +++ b/Mage.Sets/src/mage/cards/c/CursedMonstrosity.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/c/CursedRack.java b/Mage.Sets/src/mage/cards/c/CursedRack.java index bd7b2718c88..a6de2622873 100644 --- a/Mage.Sets/src/mage/cards/c/CursedRack.java +++ b/Mage.Sets/src/mage/cards/c/CursedRack.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -35,15 +34,12 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.ChooseOpponentEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/c/CursedRonin.java b/Mage.Sets/src/mage/cards/c/CursedRonin.java index 0687e3aae7e..e87a2e13080 100644 --- a/Mage.Sets/src/mage/cards/c/CursedRonin.java +++ b/Mage.Sets/src/mage/cards/c/CursedRonin.java @@ -28,9 +28,6 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -38,6 +35,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CursedScroll.java b/Mage.Sets/src/mage/cards/c/CursedScroll.java index 8b58b4984d2..88a349c41c2 100644 --- a/Mage.Sets/src/mage/cards/c/CursedScroll.java +++ b/Mage.Sets/src/mage/cards/c/CursedScroll.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -35,11 +34,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.NameACardEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -48,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CursedTotem.java b/Mage.Sets/src/mage/cards/c/CursedTotem.java index 0a41419f0b1..1fe1672602e 100644 --- a/Mage.Sets/src/mage/cards/c/CursedTotem.java +++ b/Mage.Sets/src/mage/cards/c/CursedTotem.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/c/CurtainOfLight.java b/Mage.Sets/src/mage/cards/c/CurtainOfLight.java index 6f7211f9215..bd103f67b81 100644 --- a/Mage.Sets/src/mage/cards/c/CurtainOfLight.java +++ b/Mage.Sets/src/mage/cards/c/CurtainOfLight.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; import mage.abilities.condition.common.AfterBlockersAreDeclaredCondition; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CurtainsCall.java b/Mage.Sets/src/mage/cards/c/CurtainsCall.java index 20f8c9f76ec..8e69221f5d4 100644 --- a/Mage.Sets/src/mage/cards/c/CurtainsCall.java +++ b/Mage.Sets/src/mage/cards/c/CurtainsCall.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.UndauntedAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CustodiLich.java b/Mage.Sets/src/mage/cards/c/CustodiLich.java index 3896ab02765..b4b59c8d2e1 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiLich.java +++ b/Mage.Sets/src/mage/cards/c/CustodiLich.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java index b2098d86d6c..991495dc7b3 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CustodiSquire.java b/Mage.Sets/src/mage/cards/c/CustodiSquire.java index f3b1b021652..a72441900d5 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSquire.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSquire.java @@ -27,18 +27,12 @@ */ package mage.cards.c; -import java.util.HashMap; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -49,6 +43,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.HashMap; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CustodianOfTheTrove.java b/Mage.Sets/src/mage/cards/c/CustodianOfTheTrove.java index 2a06c3acd08..f21428c9e29 100644 --- a/Mage.Sets/src/mage/cards/c/CustodianOfTheTrove.java +++ b/Mage.Sets/src/mage/cards/c/CustodianOfTheTrove.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.keyword.DefenderAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/c/CutTheEarthlyBond.java b/Mage.Sets/src/mage/cards/c/CutTheEarthlyBond.java index 9eba7f7a867..7c817023a32 100644 --- a/Mage.Sets/src/mage/cards/c/CutTheEarthlyBond.java +++ b/Mage.Sets/src/mage/cards/c/CutTheEarthlyBond.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CutTheTethers.java b/Mage.Sets/src/mage/cards/c/CutTheTethers.java index 92f863d209c..0c65bf84309 100644 --- a/Mage.Sets/src/mage/cards/c/CutTheTethers.java +++ b/Mage.Sets/src/mage/cards/c/CutTheTethers.java @@ -27,16 +27,14 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -44,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CutthroatIlDal.java b/Mage.Sets/src/mage/cards/c/CutthroatIlDal.java index e9347001607..bb980ee256f 100644 --- a/Mage.Sets/src/mage/cards/c/CutthroatIlDal.java +++ b/Mage.Sets/src/mage/cards/c/CutthroatIlDal.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HellbentCondition; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/c/CutthroatManeuver.java b/Mage.Sets/src/mage/cards/c/CutthroatManeuver.java index cbafc300683..2c5c6995e7e 100644 --- a/Mage.Sets/src/mage/cards/c/CutthroatManeuver.java +++ b/Mage.Sets/src/mage/cards/c/CutthroatManeuver.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CyclicalEvolution.java b/Mage.Sets/src/mage/cards/c/CyclicalEvolution.java index 1d50181299a..f7fde21fa41 100644 --- a/Mage.Sets/src/mage/cards/c/CyclicalEvolution.java +++ b/Mage.Sets/src/mage/cards/c/CyclicalEvolution.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CycloneSire.java b/Mage.Sets/src/mage/cards/c/CycloneSire.java index 3c45fcbf27c..038edc5ddd4 100644 --- a/Mage.Sets/src/mage/cards/c/CycloneSire.java +++ b/Mage.Sets/src/mage/cards/c/CycloneSire.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.game.permanent.token.WallOfResurgenceToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CyclonicRift.java b/Mage.Sets/src/mage/cards/c/CyclonicRift.java index b9c1262408a..73c00372e82 100644 --- a/Mage.Sets/src/mage/cards/c/CyclonicRift.java +++ b/Mage.Sets/src/mage/cards/c/CyclonicRift.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanMummy.java b/Mage.Sets/src/mage/cards/c/CyclopeanMummy.java index 855115fd65d..4b9668c284d 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanMummy.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanMummy.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ExileSourceEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Derpthemeus diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java b/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java index 02f9a5d6e7c..c73dfe0407c 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java b/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java index 38a2568b0c5..86cc0ff33eb 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -47,14 +43,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.effects.common.counter.RemoveAllCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.SubLayer; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; @@ -68,6 +57,11 @@ import mage.target.common.TargetLandPermanent; import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author MTGfan diff --git a/Mage.Sets/src/mage/cards/c/CyclopsGladiator.java b/Mage.Sets/src/mage/cards/c/CyclopsGladiator.java index 331cb694e24..4eabb17466b 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopsGladiator.java +++ b/Mage.Sets/src/mage/cards/c/CyclopsGladiator.java @@ -28,15 +28,14 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java b/Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java index c48c3360a21..bd2e338cd2a 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java +++ b/Mage.Sets/src/mage/cards/c/CyclopsOfEternalFury.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CyclopsOfOneEyedPass.java b/Mage.Sets/src/mage/cards/c/CyclopsOfOneEyedPass.java index 036a30e0a1b..166a00b85dc 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopsOfOneEyedPass.java +++ b/Mage.Sets/src/mage/cards/c/CyclopsOfOneEyedPass.java @@ -27,12 +27,13 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/c/CyclopsTyrant.java b/Mage.Sets/src/mage/cards/c/CyclopsTyrant.java index c4e24d0016e..f554f42cb1c 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopsTyrant.java +++ b/Mage.Sets/src/mage/cards/c/CyclopsTyrant.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBlockCreaturesSourceEffect; @@ -40,6 +39,8 @@ import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/CylianElf.java b/Mage.Sets/src/mage/cards/c/CylianElf.java index 6f24408df70..031ed236e63 100644 --- a/Mage.Sets/src/mage/cards/c/CylianElf.java +++ b/Mage.Sets/src/mage/cards/c/CylianElf.java @@ -28,11 +28,12 @@ package mage.cards.c; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/c/CylianSunsinger.java b/Mage.Sets/src/mage/cards/c/CylianSunsinger.java index efe994b2a1b..64f2431c81a 100644 --- a/Mage.Sets/src/mage/cards/c/CylianSunsinger.java +++ b/Mage.Sets/src/mage/cards/c/CylianSunsinger.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/c/Cystbearer.java b/Mage.Sets/src/mage/cards/c/Cystbearer.java index 96f5f984492..10571a83917 100644 --- a/Mage.Sets/src/mage/cards/c/Cystbearer.java +++ b/Mage.Sets/src/mage/cards/c/Cystbearer.java @@ -28,13 +28,13 @@ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * Cystbearer diff --git a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java index 49debbe1db3..56e4a18c181 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author JotaPeRL diff --git a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java index f4414962077..2d0564657ca 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/c/CytospawnShambler.java b/Mage.Sets/src/mage/cards/c/CytospawnShambler.java index 27132344858..6441a126bd1 100644 --- a/Mage.Sets/src/mage/cards/c/CytospawnShambler.java +++ b/Mage.Sets/src/mage/cards/c/CytospawnShambler.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author JotaPeRL diff --git a/Mage.Sets/src/mage/cards/d/DAvenantArcher.java b/Mage.Sets/src/mage/cards/d/DAvenantArcher.java index 0642070c761..a830713e7c9 100644 --- a/Mage.Sets/src/mage/cards/d/DAvenantArcher.java +++ b/Mage.Sets/src/mage/cards/d/DAvenantArcher.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DAvenantHealer.java b/Mage.Sets/src/mage/cards/d/DAvenantHealer.java index 9647b3090be..c09cd5fe928 100644 --- a/Mage.Sets/src/mage/cards/d/DAvenantHealer.java +++ b/Mage.Sets/src/mage/cards/d/DAvenantHealer.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DackFayden.java b/Mage.Sets/src/mage/cards/d/DackFayden.java index 71cc828ce74..b140eff403d 100644 --- a/Mage.Sets/src/mage/cards/d/DackFayden.java +++ b/Mage.Sets/src/mage/cards/d/DackFayden.java @@ -40,12 +40,7 @@ import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.command.Emblem; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/d/DacksDuplicate.java b/Mage.Sets/src/mage/cards/d/DacksDuplicate.java index fe6eddecbfc..eb51d754324 100644 --- a/Mage.Sets/src/mage/cards/d/DacksDuplicate.java +++ b/Mage.Sets/src/mage/cards/d/DacksDuplicate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.common.EntersBattlefieldAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.functions.ApplyToPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DaggerbackBasilisk.java b/Mage.Sets/src/mage/cards/d/DaggerbackBasilisk.java index a7e27113ba6..a2efacacabe 100644 --- a/Mage.Sets/src/mage/cards/d/DaggerbackBasilisk.java +++ b/Mage.Sets/src/mage/cards/d/DaggerbackBasilisk.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DaggerclawImp.java b/Mage.Sets/src/mage/cards/d/DaggerclawImp.java index 9c6e7a8f88e..0a8ee4b956b 100644 --- a/Mage.Sets/src/mage/cards/d/DaggerclawImp.java +++ b/Mage.Sets/src/mage/cards/d/DaggerclawImp.java @@ -28,13 +28,14 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DaggerdromeImp.java b/Mage.Sets/src/mage/cards/d/DaggerdromeImp.java index f8f6e71a633..3a2f272c60d 100644 --- a/Mage.Sets/src/mage/cards/d/DaggerdromeImp.java +++ b/Mage.Sets/src/mage/cards/d/DaggerdromeImp.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java b/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java index ff830a1e69b..5fda7dec420 100644 --- a/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java +++ b/Mage.Sets/src/mage/cards/d/DaghatarTheAdamant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -49,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +59,7 @@ public class DaghatarTheAdamant extends CardImpl { public DaghatarTheAdamant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java b/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java index 7dda04e67d9..b3d34cf054f 100644 --- a/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java +++ b/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MonstrousCondition; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DailyRegimen.java b/Mage.Sets/src/mage/cards/d/DailyRegimen.java index bfad958efc7..acfbbc275ae 100644 --- a/Mage.Sets/src/mage/cards/d/DailyRegimen.java +++ b/Mage.Sets/src/mage/cards/d/DailyRegimen.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -43,6 +42,8 @@ import mage.counters.CounterType; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DakkonBlackblade.java b/Mage.Sets/src/mage/cards/d/DakkonBlackblade.java index 7dc5d6375f2..c74a213e55b 100644 --- a/Mage.Sets/src/mage/cards/d/DakkonBlackblade.java +++ b/Mage.Sets/src/mage/cards/d/DakkonBlackblade.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -51,7 +53,7 @@ public class DakkonBlackblade extends CardImpl { public DakkonBlackblade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/d/DakmorBat.java b/Mage.Sets/src/mage/cards/d/DakmorBat.java index ffd9e34e416..0c309fd15ee 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorBat.java +++ b/Mage.Sets/src/mage/cards/d/DakmorBat.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DakmorGhoul.java b/Mage.Sets/src/mage/cards/d/DakmorGhoul.java index 63eee52d802..6f34e0f63a3 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorGhoul.java +++ b/Mage.Sets/src/mage/cards/d/DakmorGhoul.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DakmorLancer.java b/Mage.Sets/src/mage/cards/d/DakmorLancer.java index 4a48ebf48d2..e39c97927dd 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorLancer.java +++ b/Mage.Sets/src/mage/cards/d/DakmorLancer.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DakmorPlague.java b/Mage.Sets/src/mage/cards/d/DakmorPlague.java index c5722d2eb7d..370735f61cb 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorPlague.java +++ b/Mage.Sets/src/mage/cards/d/DakmorPlague.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DakmorSalvage.java b/Mage.Sets/src/mage/cards/d/DakmorSalvage.java index 6b78504ddf9..3e23625e3eb 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorSalvage.java +++ b/Mage.Sets/src/mage/cards/d/DakmorSalvage.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.keyword.DredgeAbility; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DakmorScorpion.java b/Mage.Sets/src/mage/cards/d/DakmorScorpion.java index c10357bf969..de2ff1579bb 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorScorpion.java +++ b/Mage.Sets/src/mage/cards/d/DakmorScorpion.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DakmorSorceress.java b/Mage.Sets/src/mage/cards/d/DakmorSorceress.java index 3dfeb8af4bb..b3346cdec0a 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorSorceress.java +++ b/Mage.Sets/src/mage/cards/d/DakmorSorceress.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DakraMystic.java b/Mage.Sets/src/mage/cards/d/DakraMystic.java index ace9563f95b..5c00e8b2fde 100644 --- a/Mage.Sets/src/mage/cards/d/DakraMystic.java +++ b/Mage.Sets/src/mage/cards/d/DakraMystic.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java b/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java index dc4634499b4..7752d8903e5 100644 --- a/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java +++ b/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,11 +39,14 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 @@ -53,7 +55,7 @@ public class DamiaSageOfStone extends CardImpl { public DamiaSageOfStone(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Gorgon"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/d/DamnablePact.java b/Mage.Sets/src/mage/cards/d/DamnablePact.java index 315a4649c9e..80be287ff59 100644 --- a/Mage.Sets/src/mage/cards/d/DamnablePact.java +++ b/Mage.Sets/src/mage/cards/d/DamnablePact.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/Damnation.java b/Mage.Sets/src/mage/cards/d/Damnation.java index 5b06627aada..a6b72f2b2f4 100644 --- a/Mage.Sets/src/mage/cards/d/Damnation.java +++ b/Mage.Sets/src/mage/cards/d/Damnation.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DampenThought.java b/Mage.Sets/src/mage/cards/d/DampenThought.java index d37346e0a52..bdc5a96b5c0 100644 --- a/Mage.Sets/src/mage/cards/d/DampenThought.java +++ b/Mage.Sets/src/mage/cards/d/DampenThought.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.SpliceOntoArcaneAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DampeningPulse.java b/Mage.Sets/src/mage/cards/d/DampeningPulse.java index 72e04d6c9eb..35b7e98e42d 100644 --- a/Mage.Sets/src/mage/cards/d/DampeningPulse.java +++ b/Mage.Sets/src/mage/cards/d/DampeningPulse.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DampingField.java b/Mage.Sets/src/mage/cards/d/DampingField.java index 5aadba05d85..2b4b963eb1b 100644 --- a/Mage.Sets/src/mage/cards/d/DampingField.java +++ b/Mage.Sets/src/mage/cards/d/DampingField.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionUntapNotMoreThanEffect; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DampingMatrix.java b/Mage.Sets/src/mage/cards/d/DampingMatrix.java index 548cca9ee62..a148069ac6b 100644 --- a/Mage.Sets/src/mage/cards/d/DampingMatrix.java +++ b/Mage.Sets/src/mage/cards/d/DampingMatrix.java @@ -27,11 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,6 +34,10 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -47,6 +46,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DanceOfMany.java b/Mage.Sets/src/mage/cards/d/DanceOfMany.java index 290a089ecbe..fce68158a8b 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfMany.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfMany.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,11 +44,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; @@ -60,6 +54,9 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DanceOfShadows.java b/Mage.Sets/src/mage/cards/d/DanceOfShadows.java index 6509187e2fe..168ff866857 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfShadows.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfShadows.java @@ -28,18 +28,18 @@ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java index df5a9eae310..25f3c79a69e 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.Mode; @@ -50,13 +49,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -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.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.PermanentIdPredicate; @@ -67,6 +60,8 @@ import mage.target.Target; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DanceWithDevils.java b/Mage.Sets/src/mage/cards/d/DanceWithDevils.java index 4516331d3e7..f4028c6c283 100644 --- a/Mage.Sets/src/mage/cards/d/DanceWithDevils.java +++ b/Mage.Sets/src/mage/cards/d/DanceWithDevils.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.DevilToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DancingScimitar.java b/Mage.Sets/src/mage/cards/d/DancingScimitar.java index 550e85c9a60..522a176d2dd 100644 --- a/Mage.Sets/src/mage/cards/d/DancingScimitar.java +++ b/Mage.Sets/src/mage/cards/d/DancingScimitar.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/Dandan.java b/Mage.Sets/src/mage/cards/d/Dandan.java index dca6a686898..d31130ebe44 100644 --- a/Mage.Sets/src/mage/cards/d/Dandan.java +++ b/Mage.Sets/src/mage/cards/d/Dandan.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -35,10 +34,13 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/d/DangerousWager.java b/Mage.Sets/src/mage/cards/d/DangerousWager.java index 09a0fdb9e98..4bc57e8b56d 100644 --- a/Mage.Sets/src/mage/cards/d/DangerousWager.java +++ b/Mage.Sets/src/mage/cards/d/DangerousWager.java @@ -27,18 +27,19 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DarajaGriffin.java b/Mage.Sets/src/mage/cards/d/DarajaGriffin.java index 55fb01f0170..82b8c04a9a0 100644 --- a/Mage.Sets/src/mage/cards/d/DarajaGriffin.java +++ b/Mage.Sets/src/mage/cards/d/DarajaGriffin.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/Darba.java b/Mage.Sets/src/mage/cards/d/Darba.java index ecc9c9d1208..b9879fb21a7 100644 --- a/Mage.Sets/src/mage/cards/d/Darba.java +++ b/Mage.Sets/src/mage/cards/d/Darba.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DaredevilDragster.java b/Mage.Sets/src/mage/cards/d/DaredevilDragster.java index f6cc4f5d961..3034158b728 100644 --- a/Mage.Sets/src/mage/cards/d/DaredevilDragster.java +++ b/Mage.Sets/src/mage/cards/d/DaredevilDragster.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EndOfCombatTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.common.AttackedOrBlockedThisCombatWatcher; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java b/Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java index d2f7d43d995..7d018ce125a 100644 --- a/Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java +++ b/Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -54,6 +53,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCardInGraveyardOrBattlefield; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarettiScrapSavant.java b/Mage.Sets/src/mage/cards/d/DarettiScrapSavant.java index febe5dd0080..68201fdf555 100644 --- a/Mage.Sets/src/mage/cards/d/DarettiScrapSavant.java +++ b/Mage.Sets/src/mage/cards/d/DarettiScrapSavant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.TriggeredAbilityImpl; @@ -61,6 +60,8 @@ import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetDiscard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java b/Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java index 89e9abf7066..e53c1e5f8d0 100644 --- a/Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java +++ b/Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -37,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -44,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.SoldierToken; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +54,7 @@ public class DarienKingOfKjeldor extends CardImpl { public DarienKingOfKjeldor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java b/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java index e702ce8a3c7..0667f196f40 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,11 +39,14 @@ import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author FenrisulfrX @@ -53,7 +55,7 @@ public class DarigaazTheIgniter extends CardImpl { public DarigaazTheIgniter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/d/DarigaazsAttendant.java b/Mage.Sets/src/mage/cards/d/DarigaazsAttendant.java index a0b07f2c42f..00f2866525b 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazsAttendant.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazsAttendant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DarigaazsCaldera.java b/Mage.Sets/src/mage/cards/d/DarigaazsCaldera.java index 5b157ee0382..bc39942388c 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazsCaldera.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazsCaldera.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java b/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java index e7bce7f4ad1..31ad43ea81c 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -42,6 +41,8 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/d/DaringApprentice.java b/Mage.Sets/src/mage/cards/d/DaringApprentice.java index 0367153fd74..43f218c48e7 100644 --- a/Mage.Sets/src/mage/cards/d/DaringApprentice.java +++ b/Mage.Sets/src/mage/cards/d/DaringApprentice.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DaringDemolition.java b/Mage.Sets/src/mage/cards/d/DaringDemolition.java index ab85bbe754c..94e3022dd94 100644 --- a/Mage.Sets/src/mage/cards/d/DaringDemolition.java +++ b/Mage.Sets/src/mage/cards/d/DaringDemolition.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DaringLeap.java b/Mage.Sets/src/mage/cards/d/DaringLeap.java index 2e56b8d4447..051fd97607a 100644 --- a/Mage.Sets/src/mage/cards/d/DaringLeap.java +++ b/Mage.Sets/src/mage/cards/d/DaringLeap.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DaringSkyjek.java b/Mage.Sets/src/mage/cards/d/DaringSkyjek.java index b85e9f29992..6af44fe23b8 100644 --- a/Mage.Sets/src/mage/cards/d/DaringSkyjek.java +++ b/Mage.Sets/src/mage/cards/d/DaringSkyjek.java @@ -27,15 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.BattalionAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DaringSleuth.java b/Mage.Sets/src/mage/cards/d/DaringSleuth.java index 9c62f07e530..7a9927c062f 100644 --- a/Mage.Sets/src/mage/cards/d/DaringSleuth.java +++ b/Mage.Sets/src/mage/cards/d/DaringSleuth.java @@ -27,20 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.b.BearerOfOverwhelmingTruths; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.b.BearerOfOverwhelmingTruths; import mage.constants.CardType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DaringThief.java b/Mage.Sets/src/mage/cards/d/DaringThief.java index 6a34d54197d..338a024f364 100644 --- a/Mage.Sets/src/mage/cards/d/DaringThief.java +++ b/Mage.Sets/src/mage/cards/d/DaringThief.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -51,6 +48,10 @@ import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkApprenticeship.java b/Mage.Sets/src/mage/cards/d/DarkApprenticeship.java index a622bca32fa..a7eb5509b5b 100644 --- a/Mage.Sets/src/mage/cards/d/DarkApprenticeship.java +++ b/Mage.Sets/src/mage/cards/d/DarkApprenticeship.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.HateCondition; @@ -40,6 +39,8 @@ import mage.constants.TargetController; import mage.target.TargetPlayer; import mage.watchers.common.LifeLossOtherFromCombatWatcher; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DarkBanishing.java b/Mage.Sets/src/mage/cards/d/DarkBanishing.java index ec6edaa94d4..2b0e60e5276 100644 --- a/Mage.Sets/src/mage/cards/d/DarkBanishing.java +++ b/Mage.Sets/src/mage/cards/d/DarkBanishing.java @@ -27,17 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DarkBetrayal.java b/Mage.Sets/src/mage/cards/d/DarkBetrayal.java index 976a13d3a65..f4b329b6627 100644 --- a/Mage.Sets/src/mage/cards/d/DarkBetrayal.java +++ b/Mage.Sets/src/mage/cards/d/DarkBetrayal.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkConfidant.java b/Mage.Sets/src/mage/cards/d/DarkConfidant.java index b70c8cb6c6c..8e363a2b01c 100644 --- a/Mage.Sets/src/mage/cards/d/DarkConfidant.java +++ b/Mage.Sets/src/mage/cards/d/DarkConfidant.java @@ -27,16 +27,11 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -45,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DarkDabbling.java b/Mage.Sets/src/mage/cards/d/DarkDabbling.java index 78fa1d99bec..2694bfa3aab 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDabbling.java +++ b/Mage.Sets/src/mage/cards/d/DarkDabbling.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.SpellMasteryCondition; import mage.abilities.effects.OneShotEffect; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkDeal.java b/Mage.Sets/src/mage/cards/d/DarkDeal.java index 319e4ceda95..9ed9a946c65 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDeal.java +++ b/Mage.Sets/src/mage/cards/d/DarkDeal.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +36,10 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkDecision.java b/Mage.Sets/src/mage/cards/d/DarkDecision.java index 350518ffba6..3dccc392322 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDecision.java +++ b/Mage.Sets/src/mage/cards/d/DarkDecision.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.common.PayLifeCost; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DarkDepths.java b/Mage.Sets/src/mage/cards/d/DarkDepths.java index b53e1a351b2..795d33eacdf 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDepths.java +++ b/Mage.Sets/src/mage/cards/d/DarkDepths.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; @@ -43,6 +42,7 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -50,6 +50,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Plopman @@ -58,8 +60,8 @@ public class DarkDepths extends CardImpl { public DarkDepths(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); - this.supertype.add("Legendary"); - this.supertype.add("Snow"); + addSuperType(SuperType.LEGENDARY); + addSuperType(SuperType.SNOW); // Dark Depths enters the battlefield with ten ice counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.ICE.createInstance(10)), "with ten ice counters on it")); @@ -146,7 +148,7 @@ class MaritLageToken extends Token { this.setOriginalExpansionSetCode("CSP"); cardType.add(CardType.CREATURE); subtype.add("Avatar"); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); color.setBlack(true); power = new MageInt(20); diff --git a/Mage.Sets/src/mage/cards/d/DarkFavor.java b/Mage.Sets/src/mage/cards/d/DarkFavor.java index 0df67d0b124..fc26d00bc6e 100644 --- a/Mage.Sets/src/mage/cards/d/DarkFavor.java +++ b/Mage.Sets/src/mage/cards/d/DarkFavor.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,9 +37,15 @@ 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/DarkHatchling.java b/Mage.Sets/src/mage/cards/d/DarkHatchling.java index c1046aea07c..86a57e36e5c 100644 --- a/Mage.Sets/src/mage/cards/d/DarkHatchling.java +++ b/Mage.Sets/src/mage/cards/d/DarkHatchling.java @@ -28,8 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,11 +36,14 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java b/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java index 6fab43f77c6..742aa0ffad6 100644 --- a/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java +++ b/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java @@ -27,19 +27,19 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DarkImpostor.java b/Mage.Sets/src/mage/cards/d/DarkImpostor.java index e8591138186..bf9542b9a79 100644 --- a/Mage.Sets/src/mage/cards/d/DarkImpostor.java +++ b/Mage.Sets/src/mage/cards/d/DarkImpostor.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -41,17 +40,14 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/d/DarkIntimations.java b/Mage.Sets/src/mage/cards/d/DarkIntimations.java index 4b9e9da87f2..ebb1985a2cd 100644 --- a/Mage.Sets/src/mage/cards/d/DarkIntimations.java +++ b/Mage.Sets/src/mage/cards/d/DarkIntimations.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.ContinuousEffect; @@ -38,11 +35,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; @@ -61,6 +54,10 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkMaze.java b/Mage.Sets/src/mage/cards/d/DarkMaze.java index 8b855845138..59988504dd8 100644 --- a/Mage.Sets/src/mage/cards/d/DarkMaze.java +++ b/Mage.Sets/src/mage/cards/d/DarkMaze.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DarkOffering.java b/Mage.Sets/src/mage/cards/d/DarkOffering.java index c9d3715b41d..1f16840709f 100644 --- a/Mage.Sets/src/mage/cards/d/DarkOffering.java +++ b/Mage.Sets/src/mage/cards/d/DarkOffering.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DarkPetition.java b/Mage.Sets/src/mage/cards/d/DarkPetition.java index 5bb744c33cf..e89b4ccf5b3 100644 --- a/Mage.Sets/src/mage/cards/d/DarkPetition.java +++ b/Mage.Sets/src/mage/cards/d/DarkPetition.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.condition.common.SpellMasteryCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkProphecy.java b/Mage.Sets/src/mage/cards/d/DarkProphecy.java index a2ba6f7e438..5e66d06e28f 100644 --- a/Mage.Sets/src/mage/cards/d/DarkProphecy.java +++ b/Mage.Sets/src/mage/cards/d/DarkProphecy.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkRevenant.java b/Mage.Sets/src/mage/cards/d/DarkRevenant.java index 7945dd5765f..0879d865b31 100644 --- a/Mage.Sets/src/mage/cards/d/DarkRevenant.java +++ b/Mage.Sets/src/mage/cards/d/DarkRevenant.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -39,10 +35,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkRitual.java b/Mage.Sets/src/mage/cards/d/DarkRitual.java index 3776d1e2e42..47e71d804d8 100644 --- a/Mage.Sets/src/mage/cards/d/DarkRitual.java +++ b/Mage.Sets/src/mage/cards/d/DarkRitual.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DarkSalvation.java b/Mage.Sets/src/mage/cards/d/DarkSalvation.java index 6b5189a12f4..3ba3e70c5ac 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSalvation.java +++ b/Mage.Sets/src/mage/cards/d/DarkSalvation.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; @@ -47,6 +46,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java index bde1f4d55fb..7edc3dd9516 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java +++ b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.List; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +37,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; @@ -52,6 +49,9 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DarkSuspicions.java b/Mage.Sets/src/mage/cards/d/DarkSuspicions.java index 00cc34d2fea..1e772f0c9af 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSuspicions.java +++ b/Mage.Sets/src/mage/cards/d/DarkSuspicions.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -40,6 +38,8 @@ import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author ESOF_1617_T5_G3 diff --git a/Mage.Sets/src/mage/cards/d/DarkTemper.java b/Mage.Sets/src/mage/cards/d/DarkTemper.java index ca716430f39..4c7a1601729 100644 --- a/Mage.Sets/src/mage/cards/d/DarkTemper.java +++ b/Mage.Sets/src/mage/cards/d/DarkTemper.java @@ -27,13 +27,13 @@ */ package mage.cards.d; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/d/DarkTrooper.java b/Mage.Sets/src/mage/cards/d/DarkTrooper.java index de71b0dcdf1..92024584fff 100644 --- a/Mage.Sets/src/mage/cards/d/DarkTrooper.java +++ b/Mage.Sets/src/mage/cards/d/DarkTrooper.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.RepairAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DarkTutelage.java b/Mage.Sets/src/mage/cards/d/DarkTutelage.java index 8b258646971..d2da2ea5f9d 100644 --- a/Mage.Sets/src/mage/cards/d/DarkTutelage.java +++ b/Mage.Sets/src/mage/cards/d/DarkTutelage.java @@ -28,15 +28,10 @@ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -44,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DarkWithering.java b/Mage.Sets/src/mage/cards/d/DarkWithering.java index 320cc063fc3..fef0ee11ca1 100644 --- a/Mage.Sets/src/mage/cards/d/DarkWithering.java +++ b/Mage.Sets/src/mage/cards/d/DarkWithering.java @@ -27,13 +27,13 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; diff --git a/Mage.Sets/src/mage/cards/d/Darkblast.java b/Mage.Sets/src/mage/cards/d/Darkblast.java index 050dbfa5aae..552e41dafea 100644 --- a/Mage.Sets/src/mage/cards/d/Darkblast.java +++ b/Mage.Sets/src/mage/cards/d/Darkblast.java @@ -27,15 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DarkestHour.java b/Mage.Sets/src/mage/cards/d/DarkestHour.java index 64134a51cbc..e14c48fa18c 100644 --- a/Mage.Sets/src/mage/cards/d/DarkestHour.java +++ b/Mage.Sets/src/mage/cards/d/DarkestHour.java @@ -27,23 +27,19 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DarkheartSliver.java b/Mage.Sets/src/mage/cards/d/DarkheartSliver.java index 92efb96f2fd..26523b7f8ab 100644 --- a/Mage.Sets/src/mage/cards/d/DarkheartSliver.java +++ b/Mage.Sets/src/mage/cards/d/DarkheartSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/d/DarklingStalker.java b/Mage.Sets/src/mage/cards/d/DarklingStalker.java index f6239a1a896..5bfa19e138c 100644 --- a/Mage.Sets/src/mage/cards/d/DarklingStalker.java +++ b/Mage.Sets/src/mage/cards/d/DarklingStalker.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -37,6 +34,12 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java b/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java index 662a1e1988f..ea2680e9582 100644 --- a/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java +++ b/Mage.Sets/src/mage/cards/d/DarklitGargoyle.java @@ -28,10 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +35,11 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/Darkness.java b/Mage.Sets/src/mage/cards/d/Darkness.java index 8e5e6385b17..8d17477a9f2 100644 --- a/Mage.Sets/src/mage/cards/d/Darkness.java +++ b/Mage.Sets/src/mage/cards/d/Darkness.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DarkslickDrake.java b/Mage.Sets/src/mage/cards/d/DarkslickDrake.java index fab4d09dad7..1cabe116fcc 100644 --- a/Mage.Sets/src/mage/cards/d/DarkslickDrake.java +++ b/Mage.Sets/src/mage/cards/d/DarkslickDrake.java @@ -28,13 +28,13 @@ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DarkslickShores.java b/Mage.Sets/src/mage/cards/d/DarkslickShores.java index 6633e5b70fa..47e6dc8babb 100644 --- a/Mage.Sets/src/mage/cards/d/DarkslickShores.java +++ b/Mage.Sets/src/mage/cards/d/DarkslickShores.java @@ -28,23 +28,23 @@ package mage.cards.d; -import java.util.UUID; - import mage.abilities.CountType; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.InvertCondition; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/d/DarksteelAxe.java b/Mage.Sets/src/mage/cards/d/DarksteelAxe.java index 23551419323..defacf376f3 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelAxe.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelAxe.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -38,7 +35,11 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DarksteelBrute.java b/Mage.Sets/src/mage/cards/d/DarksteelBrute.java index 327604e5fbe..29172d201af 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelBrute.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelBrute.java @@ -28,10 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,9 +35,13 @@ import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DarksteelCitadel.java b/Mage.Sets/src/mage/cards/d/DarksteelCitadel.java index 469bfd4fe12..c2f8f19c52a 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelCitadel.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelCitadel.java @@ -28,12 +28,13 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DarksteelColossus.java b/Mage.Sets/src/mage/cards/d/DarksteelColossus.java index 9157f64b33b..ea46de60e97 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelColossus.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelColossus.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.PutIntoGraveFromAnywhereSourceAbility; import mage.abilities.effects.common.RevealAndShuffleIntoLibrarySourceEffect; @@ -38,6 +35,9 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DarksteelForge.java b/Mage.Sets/src/mage/cards/d/DarksteelForge.java index 776223c9811..c99f682aad0 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelForge.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelForge.java @@ -28,20 +28,20 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/DarksteelGargoyle.java b/Mage.Sets/src/mage/cards/d/DarksteelGargoyle.java index 4bf3c0876c9..980f6971109 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelGargoyle.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelGargoyle.java @@ -28,14 +28,14 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DarksteelJuggernaut.java b/Mage.Sets/src/mage/cards/d/DarksteelJuggernaut.java index f118961dcbc..f977141cb6f 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelJuggernaut.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelJuggernaut.java @@ -27,19 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; +import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java index 070fc2ebc11..a496f2caef5 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarksteelMyr.java b/Mage.Sets/src/mage/cards/d/DarksteelMyr.java index f2d7914a59e..4a9076b6cf3 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelMyr.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelMyr.java @@ -28,12 +28,13 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DarksteelPendant.java b/Mage.Sets/src/mage/cards/d/DarksteelPendant.java index 7a8aff77c9e..547b5af0ffc 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelPendant.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelPendant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarksteelPlate.java b/Mage.Sets/src/mage/cards/d/DarksteelPlate.java index 81a817fb147..d47216e1567 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelPlate.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelPlate.java @@ -28,12 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -41,6 +35,9 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DarksteelReactor.java b/Mage.Sets/src/mage/cards/d/DarksteelReactor.java index 4f09a1c735f..1f7dbed9567 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelReactor.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelReactor.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.WinGameSourceControllerEffect; @@ -38,11 +34,16 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DarksteelRelic.java b/Mage.Sets/src/mage/cards/d/DarksteelRelic.java index 1b2655eb3a6..2eeb25a4fc2 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelRelic.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelRelic.java @@ -27,11 +27,12 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DarksteelSentinel.java b/Mage.Sets/src/mage/cards/d/DarksteelSentinel.java index 23ce5934978..81051e630b4 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelSentinel.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelSentinel.java @@ -28,14 +28,15 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DarkthicketWolf.java b/Mage.Sets/src/mage/cards/d/DarkthicketWolf.java index 4bc93dce160..afabb60fd1e 100644 --- a/Mage.Sets/src/mage/cards/d/DarkthicketWolf.java +++ b/Mage.Sets/src/mage/cards/d/DarkthicketWolf.java @@ -27,18 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DarkwatchElves.java b/Mage.Sets/src/mage/cards/d/DarkwatchElves.java index 8ee61358b28..ccf61d1c49d 100644 --- a/Mage.Sets/src/mage/cards/d/DarkwatchElves.java +++ b/Mage.Sets/src/mage/cards/d/DarkwatchElves.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; @@ -35,6 +34,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DarkwaterCatacombs.java b/Mage.Sets/src/mage/cards/d/DarkwaterCatacombs.java index 3e1a3528af2..bb28851502b 100644 --- a/Mage.Sets/src/mage/cards/d/DarkwaterCatacombs.java +++ b/Mage.Sets/src/mage/cards/d/DarkwaterCatacombs.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DarkwaterEgg.java b/Mage.Sets/src/mage/cards/d/DarkwaterEgg.java index 113bbc301f2..285046f96ba 100644 --- a/Mage.Sets/src/mage/cards/d/DarkwaterEgg.java +++ b/Mage.Sets/src/mage/cards/d/DarkwaterEgg.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DarthMaul.java b/Mage.Sets/src/mage/cards/d/DarthMaul.java index 28c6fc7a707..20416f530f8 100644 --- a/Mage.Sets/src/mage/cards/d/DarthMaul.java +++ b/Mage.Sets/src/mage/cards/d/DarthMaul.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -40,9 +39,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.target.common.TargetCreaturePermanent; import mage.watchers.common.LifeLossOtherFromCombatWatcher; +import java.util.UUID; + /** * * @author Styxo @@ -51,7 +53,7 @@ public class DarthMaul extends CardImpl { public DarthMaul(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zabrak"); this.subtype.add("Sith"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/d/DarthSidiousSithLord.java b/Mage.Sets/src/mage/cards/d/DarthSidiousSithLord.java index e3836bb883e..e8e06a80f98 100644 --- a/Mage.Sets/src/mage/cards/d/DarthSidiousSithLord.java +++ b/Mage.Sets/src/mage/cards/d/DarthSidiousSithLord.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -47,6 +46,8 @@ import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DarthTyranus.java b/Mage.Sets/src/mage/cards/d/DarthTyranus.java index 18766d2ec60..a02a273052b 100644 --- a/Mage.Sets/src/mage/cards/d/DarthTyranus.java +++ b/Mage.Sets/src/mage/cards/d/DarthTyranus.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -52,6 +51,8 @@ import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DarthVader.java b/Mage.Sets/src/mage/cards/d/DarthVader.java index 2edb9cd88b6..7d34ee8d021 100644 --- a/Mage.Sets/src/mage/cards/d/DarthVader.java +++ b/Mage.Sets/src/mage/cards/d/DarthVader.java @@ -27,29 +27,25 @@ */ package mage.cards.d; -import java.util.Iterator; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.keyword.MenaceAbility; import mage.abilities.keyword.LifelinkAbility; +import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.SubLayer; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.Iterator; +import java.util.UUID; + /** * * @author Styxo @@ -58,7 +54,7 @@ public class DarthVader extends CardImpl { public DarthVader(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Sith"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/d/DartingMerfolk.java b/Mage.Sets/src/mage/cards/d/DartingMerfolk.java index e33effc1825..433c477d706 100644 --- a/Mage.Sets/src/mage/cards/d/DartingMerfolk.java +++ b/Mage.Sets/src/mage/cards/d/DartingMerfolk.java @@ -27,15 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DaruCavalier.java b/Mage.Sets/src/mage/cards/d/DaruCavalier.java index c931bd66967..28dc686b925 100644 --- a/Mage.Sets/src/mage/cards/d/DaruCavalier.java +++ b/Mage.Sets/src/mage/cards/d/DaruCavalier.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; @@ -39,6 +38,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DaruEncampment.java b/Mage.Sets/src/mage/cards/d/DaruEncampment.java index 9274272f38c..b8e42e6ea5e 100644 --- a/Mage.Sets/src/mage/cards/d/DaruEncampment.java +++ b/Mage.Sets/src/mage/cards/d/DaruEncampment.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,10 +34,15 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DaruLancer.java b/Mage.Sets/src/mage/cards/d/DaruLancer.java index 0fdd4bbefe0..e0e149b12a9 100644 --- a/Mage.Sets/src/mage/cards/d/DaruLancer.java +++ b/Mage.Sets/src/mage/cards/d/DaruLancer.java @@ -27,15 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DaruMender.java b/Mage.Sets/src/mage/cards/d/DaruMender.java index d54f78651bf..648e95a62a2 100644 --- a/Mage.Sets/src/mage/cards/d/DaruMender.java +++ b/Mage.Sets/src/mage/cards/d/DaruMender.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DaruSanctifier.java b/Mage.Sets/src/mage/cards/d/DaruSanctifier.java index 6d4676eff95..a8ab97ddadc 100644 --- a/Mage.Sets/src/mage/cards/d/DaruSanctifier.java +++ b/Mage.Sets/src/mage/cards/d/DaruSanctifier.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DaruStinger.java b/Mage.Sets/src/mage/cards/d/DaruStinger.java index 4a9b4974d6b..df094b95201 100644 --- a/Mage.Sets/src/mage/cards/d/DaruStinger.java +++ b/Mage.Sets/src/mage/cards/d/DaruStinger.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DaruWarchief.java b/Mage.Sets/src/mage/cards/d/DaruWarchief.java index b0c0aad7d31..cbe956df081 100644 --- a/Mage.Sets/src/mage/cards/d/DaruWarchief.java +++ b/Mage.Sets/src/mage/cards/d/DaruWarchief.java @@ -27,20 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DashHopes.java b/Mage.Sets/src/mage/cards/d/DashHopes.java index aa197c63814..92ade757964 100644 --- a/Mage.Sets/src/mage/cards/d/DashHopes.java +++ b/Mage.Sets/src/mage/cards/d/DashHopes.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.common.PayLifeCost; @@ -43,6 +42,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DauntlessCathar.java b/Mage.Sets/src/mage/cards/d/DauntlessCathar.java index ee27c4519dd..fd13e8e900d 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessCathar.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessCathar.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java index fcd81a17a9e..3dbb264ecf1 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -47,6 +46,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DauntlessEscort.java b/Mage.Sets/src/mage/cards/d/DauntlessEscort.java index 50bed08b9d9..c0d05af3ac6 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessEscort.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessEscort.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,9 +35,14 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DauntlessOnslaught.java b/Mage.Sets/src/mage/cards/d/DauntlessOnslaught.java index a00a0f5a213..1c4ed1d5c7f 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessOnslaught.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessOnslaught.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java index 857298880c6..246dffa4f6c 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java b/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java index 6cb66fecefe..647fa766d1f 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java +++ b/Mage.Sets/src/mage/cards/d/DauthiCutthroat.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java b/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java index fcd0c7d4e4d..e08ebfe603b 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java +++ b/Mage.Sets/src/mage/cards/d/DauthiEmbrace.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DauthiGhoul.java b/Mage.Sets/src/mage/cards/d/DauthiGhoul.java index b392902aefe..c46172955ea 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiGhoul.java +++ b/Mage.Sets/src/mage/cards/d/DauthiGhoul.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -39,6 +38,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DauthiHorror.java b/Mage.Sets/src/mage/cards/d/DauthiHorror.java index 41d05cc671a..051a3935273 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiHorror.java +++ b/Mage.Sets/src/mage/cards/d/DauthiHorror.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleEvasionAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DauthiJackal.java b/Mage.Sets/src/mage/cards/d/DauthiJackal.java index 689353a85f4..08a033f82e7 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiJackal.java +++ b/Mage.Sets/src/mage/cards/d/DauthiJackal.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DauthiMarauder.java b/Mage.Sets/src/mage/cards/d/DauthiMarauder.java index 6f0f9ac0347..5201ae64aad 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiMarauder.java +++ b/Mage.Sets/src/mage/cards/d/DauthiMarauder.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ShadowAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DauthiMercenary.java b/Mage.Sets/src/mage/cards/d/DauthiMercenary.java index e5852c94d43..62f988d582b 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiMercenary.java +++ b/Mage.Sets/src/mage/cards/d/DauthiMercenary.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +34,11 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ShadowAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DauthiMindripper.java b/Mage.Sets/src/mage/cards/d/DauthiMindripper.java index f32e8b6f51e..4db0a18c526 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiMindripper.java +++ b/Mage.Sets/src/mage/cards/d/DauthiMindripper.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DauthiSlayer.java b/Mage.Sets/src/mage/cards/d/DauthiSlayer.java index 0be247bf597..f806385f11e 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiSlayer.java +++ b/Mage.Sets/src/mage/cards/d/DauthiSlayer.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.ShadowAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DauthiTrapper.java b/Mage.Sets/src/mage/cards/d/DauthiTrapper.java index 5ebf1711d96..b9e5cedaa26 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiTrapper.java +++ b/Mage.Sets/src/mage/cards/d/DauthiTrapper.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DauthiWarlord.java b/Mage.Sets/src/mage/cards/d/DauthiWarlord.java index bb1cf1a9a37..c58e4c22d96 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiWarlord.java +++ b/Mage.Sets/src/mage/cards/d/DauthiWarlord.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -43,6 +42,8 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DawnCharm.java b/Mage.Sets/src/mage/cards/d/DawnCharm.java index b55bf2c4b74..4226b446ad2 100644 --- a/Mage.Sets/src/mage/cards/d/DawnCharm.java +++ b/Mage.Sets/src/mage/cards/d/DawnCharm.java @@ -27,15 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; @@ -45,6 +44,8 @@ import mage.target.Target; import mage.target.TargetSpell; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DawnElemental.java b/Mage.Sets/src/mage/cards/d/DawnElemental.java index 0a6dddaaa13..6c1c645d5c8 100644 --- a/Mage.Sets/src/mage/cards/d/DawnElemental.java +++ b/Mage.Sets/src/mage/cards/d/DawnElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/d/DawnGryff.java b/Mage.Sets/src/mage/cards/d/DawnGryff.java index 4fa4648a28d..7baf9a42653 100644 --- a/Mage.Sets/src/mage/cards/d/DawnGryff.java +++ b/Mage.Sets/src/mage/cards/d/DawnGryff.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DawnOfTheDead.java b/Mage.Sets/src/mage/cards/d/DawnOfTheDead.java index b3e1167e104..70898b83ce1 100644 --- a/Mage.Sets/src/mage/cards/d/DawnOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DawnOfTheDead.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,11 +40,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -53,6 +48,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DawnToDusk.java b/Mage.Sets/src/mage/cards/d/DawnToDusk.java index f360ba09a08..b616567e1c8 100644 --- a/Mage.Sets/src/mage/cards/d/DawnToDusk.java +++ b/Mage.Sets/src/mage/cards/d/DawnToDusk.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java index 92f47640d9d..8059d5c3734 100644 --- a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java +++ b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -51,6 +48,10 @@ import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCardInOpponentsGraveyard; import mage.target.common.TargetOpponent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DawnbringerCharioteers.java b/Mage.Sets/src/mage/cards/d/DawnbringerCharioteers.java index b33c88a6d1d..64289fe6b47 100644 --- a/Mage.Sets/src/mage/cards/d/DawnbringerCharioteers.java +++ b/Mage.Sets/src/mage/cards/d/DawnbringerCharioteers.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DawnfeatherEagle.java b/Mage.Sets/src/mage/cards/d/DawnfeatherEagle.java index f04c901ec3c..ee90bf1fd07 100644 --- a/Mage.Sets/src/mage/cards/d/DawnfeatherEagle.java +++ b/Mage.Sets/src/mage/cards/d/DawnfeatherEagle.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/Dawnfluke.java b/Mage.Sets/src/mage/cards/d/Dawnfluke.java index 3e28a4db65e..8a3b32b6d4a 100644 --- a/Mage.Sets/src/mage/cards/d/Dawnfluke.java +++ b/Mage.Sets/src/mage/cards/d/Dawnfluke.java @@ -27,20 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.PreventDamageToTargetEffect; -import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.EvokeAbility; +import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java b/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java index 29f4e3770e8..30230943035 100644 --- a/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java +++ b/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DawnglowInfusion.java b/Mage.Sets/src/mage/cards/d/DawnglowInfusion.java index ae9cc4ff8a5..1085a11cec1 100644 --- a/Mage.Sets/src/mage/cards/d/DawnglowInfusion.java +++ b/Mage.Sets/src/mage/cards/d/DawnglowInfusion.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.dynamicvalue.DynamicValue; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.InfoEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.watchers.common.ManaSpentToCastWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DawningPurist.java b/Mage.Sets/src/mage/cards/d/DawningPurist.java index 4a5e3e7fb47..81b1583576c 100644 --- a/Mage.Sets/src/mage/cards/d/DawningPurist.java +++ b/Mage.Sets/src/mage/cards/d/DawningPurist.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +43,8 @@ import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author djbrez diff --git a/Mage.Sets/src/mage/cards/d/DawnrayArcher.java b/Mage.Sets/src/mage/cards/d/DawnrayArcher.java index ced0eeb05f1..8dc6c21210d 100644 --- a/Mage.Sets/src/mage/cards/d/DawnrayArcher.java +++ b/Mage.Sets/src/mage/cards/d/DawnrayArcher.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +36,12 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DawnsReflection.java b/Mage.Sets/src/mage/cards/d/DawnsReflection.java index 17f7aef0b78..0f5698ee9bc 100644 --- a/Mage.Sets/src/mage/cards/d/DawnsReflection.java +++ b/Mage.Sets/src/mage/cards/d/DawnsReflection.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.common.AttachEffect; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/Dawnstrider.java b/Mage.Sets/src/mage/cards/d/Dawnstrider.java index e49ab520b25..42d6bfcf824 100644 --- a/Mage.Sets/src/mage/cards/d/Dawnstrider.java +++ b/Mage.Sets/src/mage/cards/d/Dawnstrider.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,8 +36,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DawnstrikePaladin.java b/Mage.Sets/src/mage/cards/d/DawnstrikePaladin.java index 33efd054255..020cd0249f1 100644 --- a/Mage.Sets/src/mage/cards/d/DawnstrikePaladin.java +++ b/Mage.Sets/src/mage/cards/d/DawnstrikePaladin.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.LifelinkAbility; +import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DawntreaderElk.java b/Mage.Sets/src/mage/cards/d/DawntreaderElk.java index 6408ee84b15..6fc2c8be521 100644 --- a/Mage.Sets/src/mage/cards/d/DawntreaderElk.java +++ b/Mage.Sets/src/mage/cards/d/DawntreaderElk.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,9 +34,14 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DaxosOfMeletis.java b/Mage.Sets/src/mage/cards/d/DaxosOfMeletis.java index c0b2e411ae3..1a1b07deb85 100644 --- a/Mage.Sets/src/mage/cards/d/DaxosOfMeletis.java +++ b/Mage.Sets/src/mage/cards/d/DaxosOfMeletis.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -42,12 +40,7 @@ import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.ManaType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -58,6 +51,9 @@ import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 @@ -72,7 +68,7 @@ public class DaxosOfMeletis extends CardImpl { public DaxosOfMeletis(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java b/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java index f5f4bd10c7c..f17640e5e79 100644 --- a/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java +++ b/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -41,12 +40,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -55,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes @@ -69,7 +65,7 @@ public class DaxosTheReturned extends CardImpl { public DaxosTheReturned(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/d/DaxossTorment.java b/Mage.Sets/src/mage/cards/d/DaxossTorment.java index e0ac0e2334b..ecc26a12c72 100644 --- a/Mage.Sets/src/mage/cards/d/DaxossTorment.java +++ b/Mage.Sets/src/mage/cards/d/DaxossTorment.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.ConstellationAbility; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DayOfDestiny.java b/Mage.Sets/src/mage/cards/d/DayOfDestiny.java index 1dea6612873..aca43c5e361 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfDestiny.java +++ b/Mage.Sets/src/mage/cards/d/DayOfDestiny.java @@ -27,18 +27,19 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author Loki @@ -53,7 +54,7 @@ public class DayOfDestiny extends CardImpl { public DayOfDestiny(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Legendary creatures you control get +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/cards/d/DayOfJudgment.java b/Mage.Sets/src/mage/cards/d/DayOfJudgment.java index 84c96935165..22dadf54b6a 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfJudgment.java +++ b/Mage.Sets/src/mage/cards/d/DayOfJudgment.java @@ -28,13 +28,14 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java index f787ff146de..389724f51b6 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java +++ b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -54,6 +51,10 @@ import mage.game.permanent.token.DragonToken2; import mage.players.Player; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DaybreakCoronet.java b/Mage.Sets/src/mage/cards/d/DaybreakCoronet.java index f289755247e..132997b41e5 100644 --- a/Mage.Sets/src/mage/cards/d/DaybreakCoronet.java +++ b/Mage.Sets/src/mage/cards/d/DaybreakCoronet.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.LinkedList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -42,11 +39,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -54,6 +47,10 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DaybreakRanger.java b/Mage.Sets/src/mage/cards/d/DaybreakRanger.java index aea3252e05d..2955a5f811e 100644 --- a/Mage.Sets/src/mage/cards/d/DaybreakRanger.java +++ b/Mage.Sets/src/mage/cards/d/DaybreakRanger.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -43,13 +39,18 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransformAbility; -import mage.cards.n.NightfallPredator; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.n.NightfallPredator; +import mage.constants.CardType; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DaysUndoing.java b/Mage.Sets/src/mage/cards/d/DaysUndoing.java index 7093c385dc1..ec21ebf8aac 100644 --- a/Mage.Sets/src/mage/cards/d/DaysUndoing.java +++ b/Mage.Sets/src/mage/cards/d/DaysUndoing.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Daze.java b/Mage.Sets/src/mage/cards/d/Daze.java index fd36fcc60f5..1c63ae7ba48 100644 --- a/Mage.Sets/src/mage/cards/d/Daze.java +++ b/Mage.Sets/src/mage/cards/d/Daze.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.costs.mana.GenericManaCost; @@ -41,6 +40,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/d/DazzlingRamparts.java b/Mage.Sets/src/mage/cards/d/DazzlingRamparts.java index d0c4c26341b..d99b1b5cfcf 100644 --- a/Mage.Sets/src/mage/cards/d/DazzlingRamparts.java +++ b/Mage.Sets/src/mage/cards/d/DazzlingRamparts.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DazzlingReflection.java b/Mage.Sets/src/mage/cards/d/DazzlingReflection.java index c0d22aa0194..27fa8d51b43 100644 --- a/Mage.Sets/src/mage/cards/d/DazzlingReflection.java +++ b/Mage.Sets/src/mage/cards/d/DazzlingReflection.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeadDrop.java b/Mage.Sets/src/mage/cards/d/DeadDrop.java index 655430f20dc..2d1576fd0e4 100644 --- a/Mage.Sets/src/mage/cards/d/DeadDrop.java +++ b/Mage.Sets/src/mage/cards/d/DeadDrop.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.DelveAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeadReckoning.java b/Mage.Sets/src/mage/cards/d/DeadReckoning.java index 1595bab2c2b..18b1bf2a54d 100644 --- a/Mage.Sets/src/mage/cards/d/DeadReckoning.java +++ b/Mage.Sets/src/mage/cards/d/DeadReckoning.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -43,6 +42,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DeadReveler.java b/Mage.Sets/src/mage/cards/d/DeadReveler.java index ecf55f30ab4..57e53f80eb1 100644 --- a/Mage.Sets/src/mage/cards/d/DeadReveler.java +++ b/Mage.Sets/src/mage/cards/d/DeadReveler.java @@ -26,13 +26,14 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.d; - -import java.util.UUID; -import mage.constants.CardType; + import mage.MageInt; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeadRingers.java b/Mage.Sets/src/mage/cards/d/DeadRingers.java index 212693d15a1..e0b4535e66d 100644 --- a/Mage.Sets/src/mage/cards/d/DeadRingers.java +++ b/Mage.Sets/src/mage/cards/d/DeadRingers.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.common.DestroyTargetEffect; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DeadWeight.java b/Mage.Sets/src/mage/cards/d/DeadWeight.java index 42488ad3fc7..a3d5c0445b9 100644 --- a/Mage.Sets/src/mage/cards/d/DeadWeight.java +++ b/Mage.Sets/src/mage/cards/d/DeadWeight.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,9 +34,15 @@ 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Alvin diff --git a/Mage.Sets/src/mage/cards/d/Deadapult.java b/Mage.Sets/src/mage/cards/d/Deadapult.java index 0e06a85d75b..b212867a1bd 100644 --- a/Mage.Sets/src/mage/cards/d/Deadapult.java +++ b/Mage.Sets/src/mage/cards/d/Deadapult.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DeadbridgeChant.java b/Mage.Sets/src/mage/cards/d/DeadbridgeChant.java index 2929170a409..2b265fac2af 100644 --- a/Mage.Sets/src/mage/cards/d/DeadbridgeChant.java +++ b/Mage.Sets/src/mage/cards/d/DeadbridgeChant.java @@ -27,11 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,10 +35,15 @@ import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffec import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeadbridgeGoliath.java b/Mage.Sets/src/mage/cards/d/DeadbridgeGoliath.java index 44f5991479e..52b6454eb40 100644 --- a/Mage.Sets/src/mage/cards/d/DeadbridgeGoliath.java +++ b/Mage.Sets/src/mage/cards/d/DeadbridgeGoliath.java @@ -27,12 +27,12 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ScavengeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DeadbridgeShaman.java b/Mage.Sets/src/mage/cards/d/DeadbridgeShaman.java index a2c43b48a2b..3525e4d6391 100644 --- a/Mage.Sets/src/mage/cards/d/DeadbridgeShaman.java +++ b/Mage.Sets/src/mage/cards/d/DeadbridgeShaman.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java b/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java index 7a609b7fb5b..3a22d37245e 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetOpponentsCreaturePermanent; import mage.watchers.common.RevoltWatcher; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java index ad50173d735..acb1c1a0de0 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/d/DeadlockTrap.java b/Mage.Sets/src/mage/cards/d/DeadlockTrap.java index f954244b25c..00246855ea3 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlockTrap.java +++ b/Mage.Sets/src/mage/cards/d/DeadlockTrap.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreatureOrPlaneswalker; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/d/DeadlyAllure.java b/Mage.Sets/src/mage/cards/d/DeadlyAllure.java index 59278caa5b5..eea3c749b05 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyAllure.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyAllure.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.combat.MustBeBlockedByAtLeastOneTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -37,8 +34,13 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/d/DeadlyDesigns.java b/Mage.Sets/src/mage/cards/d/DeadlyDesigns.java index adcffed33b7..472ad6b53c1 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyDesigns.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyDesigns.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DeadlyGrub.java b/Mage.Sets/src/mage/cards/d/DeadlyGrub.java index 1cfa87e8aa1..a9d4a1b1c7c 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyGrub.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyGrub.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -45,6 +44,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DeadlyInsect.java b/Mage.Sets/src/mage/cards/d/DeadlyInsect.java index 4a4588c4695..a18f299d685 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyInsect.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyInsect.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeadlyRecluse.java b/Mage.Sets/src/mage/cards/d/DeadlyRecluse.java index 5650318cb3e..da4f9eccc69 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyRecluse.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyRecluse.java @@ -28,13 +28,14 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeadlyTempest.java b/Mage.Sets/src/mage/cards/d/DeadlyTempest.java index 1fa1b74c153..036e525d052 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyTempest.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyTempest.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.HashMap; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -40,6 +38,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.HashMap; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java b/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java index 690ce38b014..d73d92db05f 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CreatureCountCondition; @@ -46,6 +45,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Deadshot.java b/Mage.Sets/src/mage/cards/d/Deadshot.java index 46643ab6d2b..75b7febc3ef 100644 --- a/Mage.Sets/src/mage/cards/d/Deadshot.java +++ b/Mage.Sets/src/mage/cards/d/Deadshot.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.TapTargetEffect; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeadshotMinotaur.java b/Mage.Sets/src/mage/cards/d/DeadshotMinotaur.java index bd3ac644114..d23f4b59943 100644 --- a/Mage.Sets/src/mage/cards/d/DeadshotMinotaur.java +++ b/Mage.Sets/src/mage/cards/d/DeadshotMinotaur.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,10 +36,13 @@ import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/d/DeadwoodTreefolk.java b/Mage.Sets/src/mage/cards/d/DeadwoodTreefolk.java index 25dce2ffa07..9611e92ab34 100644 --- a/Mage.Sets/src/mage/cards/d/DeadwoodTreefolk.java +++ b/Mage.Sets/src/mage/cards/d/DeadwoodTreefolk.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.AnotherCardPredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DearlyDeparted.java b/Mage.Sets/src/mage/cards/d/DearlyDeparted.java index 802c1caed25..4e90e35ec38 100644 --- a/Mage.Sets/src/mage/cards/d/DearlyDeparted.java +++ b/Mage.Sets/src/mage/cards/d/DearlyDeparted.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/d/DeathBaron.java b/Mage.Sets/src/mage/cards/d/DeathBaron.java index 08bf2be4764..eb2202db8b8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathBaron.java +++ b/Mage.Sets/src/mage/cards/d/DeathBaron.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,9 +35,14 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DeathBomb.java b/Mage.Sets/src/mage/cards/d/DeathBomb.java index a1ac7884648..75955b095e3 100644 --- a/Mage.Sets/src/mage/cards/d/DeathBomb.java +++ b/Mage.Sets/src/mage/cards/d/DeathBomb.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DestroyTargetEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DeathByDragons.java b/Mage.Sets/src/mage/cards/d/DeathByDragons.java index 793f6bea106..c78de6f9e42 100644 --- a/Mage.Sets/src/mage/cards/d/DeathByDragons.java +++ b/Mage.Sets/src/mage/cards/d/DeathByDragons.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathCloud.java b/Mage.Sets/src/mage/cards/d/DeathCloud.java index de7fcc19f01..728139bcc99 100644 --- a/Mage.Sets/src/mage/cards/d/DeathCloud.java +++ b/Mage.Sets/src/mage/cards/d/DeathCloud.java @@ -27,19 +27,20 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.abilities.effects.common.SacrificeAllEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathCultist.java b/Mage.Sets/src/mage/cards/d/DeathCultist.java index 3a1979bed46..c9bb92cd154 100644 --- a/Mage.Sets/src/mage/cards/d/DeathCultist.java +++ b/Mage.Sets/src/mage/cards/d/DeathCultist.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DeathDenied.java b/Mage.Sets/src/mage/cards/d/DeathDenied.java index b23b94dd451..98473312a48 100644 --- a/Mage.Sets/src/mage/cards/d/DeathDenied.java +++ b/Mage.Sets/src/mage/cards/d/DeathDenied.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathFrenzy.java b/Mage.Sets/src/mage/cards/d/DeathFrenzy.java index 21cd9c2c5bc..c36b22c094c 100644 --- a/Mage.Sets/src/mage/cards/d/DeathFrenzy.java +++ b/Mage.Sets/src/mage/cards/d/DeathFrenzy.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathGrasp.java b/Mage.Sets/src/mage/cards/d/DeathGrasp.java index 671e7d9568b..0602557aef2 100644 --- a/Mage.Sets/src/mage/cards/d/DeathGrasp.java +++ b/Mage.Sets/src/mage/cards/d/DeathGrasp.java @@ -28,15 +28,16 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java b/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java index 285ab205d9b..042b21008a7 100644 --- a/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java +++ b/Mage.Sets/src/mage/cards/d/DeathHoodCobra.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +35,11 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeathMatch.java b/Mage.Sets/src/mage/cards/d/DeathMatch.java index 38a202ac853..be741267304 100644 --- a/Mage.Sets/src/mage/cards/d/DeathMatch.java +++ b/Mage.Sets/src/mage/cards/d/DeathMatch.java @@ -27,24 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FirstTargetPointer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DeathMutation.java b/Mage.Sets/src/mage/cards/d/DeathMutation.java index bc7cc0f1d3d..1c771c40340 100644 --- a/Mage.Sets/src/mage/cards/d/DeathMutation.java +++ b/Mage.Sets/src/mage/cards/d/DeathMutation.java @@ -27,20 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DeathOfAThousandStings.java b/Mage.Sets/src/mage/cards/d/DeathOfAThousandStings.java index 747eccabe38..470334319ac 100644 --- a/Mage.Sets/src/mage/cards/d/DeathOfAThousandStings.java +++ b/Mage.Sets/src/mage/cards/d/DeathOfAThousandStings.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.MoreCardsInHandThanOpponentsCondition; @@ -43,6 +42,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathPitOffering.java b/Mage.Sets/src/mage/cards/d/DeathPitOffering.java index 845143980a0..909e16de9af 100644 --- a/Mage.Sets/src/mage/cards/d/DeathPitOffering.java +++ b/Mage.Sets/src/mage/cards/d/DeathPitOffering.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -36,16 +34,15 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.List; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DeathPitsOfRath.java b/Mage.Sets/src/mage/cards/d/DeathPitsOfRath.java index c9c1488d942..f78f5f1a165 100644 --- a/Mage.Sets/src/mage/cards/d/DeathPitsOfRath.java +++ b/Mage.Sets/src/mage/cards/d/DeathPitsOfRath.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DeathPulse.java b/Mage.Sets/src/mage/cards/d/DeathPulse.java index 85b6bbff9ee..71ae06dc2a2 100644 --- a/Mage.Sets/src/mage/cards/d/DeathPulse.java +++ b/Mage.Sets/src/mage/cards/d/DeathPulse.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Temba21 diff --git a/Mage.Sets/src/mage/cards/d/DeathRattle.java b/Mage.Sets/src/mage/cards/d/DeathRattle.java index cceef8b4734..34431e73ade 100644 --- a/Mage.Sets/src/mage/cards/d/DeathRattle.java +++ b/Mage.Sets/src/mage/cards/d/DeathRattle.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.DelveAbility; @@ -39,6 +38,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathSpark.java b/Mage.Sets/src/mage/cards/d/DeathSpark.java index a5cd714480f..99ecc69b5ff 100644 --- a/Mage.Sets/src/mage/cards/d/DeathSpark.java +++ b/Mage.Sets/src/mage/cards/d/DeathSpark.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.Condition; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DeathSpeakers.java b/Mage.Sets/src/mage/cards/d/DeathSpeakers.java index 0a981948580..8a95809f397 100644 --- a/Mage.Sets/src/mage/cards/d/DeathSpeakers.java +++ b/Mage.Sets/src/mage/cards/d/DeathSpeakers.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DeathStroke.java b/Mage.Sets/src/mage/cards/d/DeathStroke.java index df5ddda2b73..84e8ab9b27e 100644 --- a/Mage.Sets/src/mage/cards/d/DeathStroke.java +++ b/Mage.Sets/src/mage/cards/d/DeathStroke.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeathTrooper.java b/Mage.Sets/src/mage/cards/d/DeathTrooper.java index a40372eb642..2d919a0f798 100644 --- a/Mage.Sets/src/mage/cards/d/DeathTrooper.java +++ b/Mage.Sets/src/mage/cards/d/DeathTrooper.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DeathWard.java b/Mage.Sets/src/mage/cards/d/DeathWard.java index c5e28fa62f7..cf399a97581 100644 --- a/Mage.Sets/src/mage/cards/d/DeathWard.java +++ b/Mage.Sets/src/mage/cards/d/DeathWard.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/d/DeathWind.java b/Mage.Sets/src/mage/cards/d/DeathWind.java index b1858dbd52a..8803f40f862 100644 --- a/Mage.Sets/src/mage/cards/d/DeathWind.java +++ b/Mage.Sets/src/mage/cards/d/DeathWind.java @@ -27,13 +27,13 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/d/DeathWish.java b/Mage.Sets/src/mage/cards/d/DeathWish.java index 3bbf8a3919a..5260ea54dfe 100644 --- a/Mage.Sets/src/mage/cards/d/DeathWish.java +++ b/Mage.Sets/src/mage/cards/d/DeathWish.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.LoseHalfLifeEffect; import mage.abilities.effects.common.WishEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterCard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java b/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java index 2c1a254990c..67958942912 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java +++ b/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java b/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java index f20e04f74dc..16994a584af 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,6 +38,10 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -48,6 +49,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java b/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java index 88803b6a491..21a0060208e 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java b/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java index 929d6ff21e5..4b3d366a9ea 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java b/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java index 0a9368901f0..2e43a24882f 100644 --- a/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java +++ b/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DeliriumCondition; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeathcoilWurm.java b/Mage.Sets/src/mage/cards/d/DeathcoilWurm.java index 8a3fb159828..a45801394fd 100644 --- a/Mage.Sets/src/mage/cards/d/DeathcoilWurm.java +++ b/Mage.Sets/src/mage/cards/d/DeathcoilWurm.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/d/DeathcultRogue.java b/Mage.Sets/src/mage/cards/d/DeathcultRogue.java index e9dd0195feb..84f42cd8ad6 100644 --- a/Mage.Sets/src/mage/cards/d/DeathcultRogue.java +++ b/Mage.Sets/src/mage/cards/d/DeathcultRogue.java @@ -27,20 +27,20 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathcurseOgre.java b/Mage.Sets/src/mage/cards/d/DeathcurseOgre.java index c90dd3aadd5..ab8665c2a22 100644 --- a/Mage.Sets/src/mage/cards/d/DeathcurseOgre.java +++ b/Mage.Sets/src/mage/cards/d/DeathcurseOgre.java @@ -28,14 +28,14 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeathforgeShaman.java b/Mage.Sets/src/mage/cards/d/DeathforgeShaman.java index a3ae41d8ce6..bd048d5ef42 100644 --- a/Mage.Sets/src/mage/cards/d/DeathforgeShaman.java +++ b/Mage.Sets/src/mage/cards/d/DeathforgeShaman.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DeathgazeCockatrice.java b/Mage.Sets/src/mage/cards/d/DeathgazeCockatrice.java index 0e96b7bbf01..ad7f63e9fad 100644 --- a/Mage.Sets/src/mage/cards/d/DeathgazeCockatrice.java +++ b/Mage.Sets/src/mage/cards/d/DeathgazeCockatrice.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.DeathtouchAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Deathgazer.java b/Mage.Sets/src/mage/cards/d/Deathgazer.java index 4b5bf1a4b8c..b30ca5ab999 100644 --- a/Mage.Sets/src/mage/cards/d/Deathgazer.java +++ b/Mage.Sets/src/mage/cards/d/Deathgazer.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/Deathgreeter.java b/Mage.Sets/src/mage/cards/d/Deathgreeter.java index b71f8a054de..72b5e6d9929 100644 --- a/Mage.Sets/src/mage/cards/d/Deathgreeter.java +++ b/Mage.Sets/src/mage/cards/d/Deathgreeter.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/Deathgrip.java b/Mage.Sets/src/mage/cards/d/Deathgrip.java index e74a0bf8f84..c6c8a23542b 100644 --- a/Mage.Sets/src/mage/cards/d/Deathgrip.java +++ b/Mage.Sets/src/mage/cards/d/Deathgrip.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author markedagain diff --git a/Mage.Sets/src/mage/cards/d/DeathknellKami.java b/Mage.Sets/src/mage/cards/d/DeathknellKami.java index ca7a58b2621..78e1673f3da 100644 --- a/Mage.Sets/src/mage/cards/d/DeathknellKami.java +++ b/Mage.Sets/src/mage/cards/d/DeathknellKami.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Deathlace.java b/Mage.Sets/src/mage/cards/d/Deathlace.java index b13045e4b57..4582f9ad830 100644 --- a/Mage.Sets/src/mage/cards/d/Deathlace.java +++ b/Mage.Sets/src/mage/cards/d/Deathlace.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.continuous.BecomesColorTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetSpellOrPermanent; +import java.util.UUID; + /** * * @author AlumiuN diff --git a/Mage.Sets/src/mage/cards/d/DeathlessAngel.java b/Mage.Sets/src/mage/cards/d/DeathlessAngel.java index e66d04fb1d9..29e8820eb4c 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessAngel.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessAngel.java @@ -28,10 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,8 +38,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java b/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java index 0f78e9878c3..b438109abeb 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Deathmark.java b/Mage.Sets/src/mage/cards/d/Deathmark.java index 72c92b800b8..a9c4716e8d1 100644 --- a/Mage.Sets/src/mage/cards/d/Deathmark.java +++ b/Mage.Sets/src/mage/cards/d/Deathmark.java @@ -28,17 +28,18 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java b/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java index f008d95eb20..7daec164626 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java +++ b/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java b/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java index e0d8cdeefdf..ff1c1c149cb 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java +++ b/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathpactAngel.java b/Mage.Sets/src/mage/cards/d/DeathpactAngel.java index f2425c7d5ba..a7f6e5fc674 100644 --- a/Mage.Sets/src/mage/cards/d/DeathpactAngel.java +++ b/Mage.Sets/src/mage/cards/d/DeathpactAngel.java @@ -28,7 +28,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.game.permanent.token.Token; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DeathreapRitual.java b/Mage.Sets/src/mage/cards/d/DeathreapRitual.java index 7b61a71590d..a9df0c67072 100644 --- a/Mage.Sets/src/mage/cards/d/DeathreapRitual.java +++ b/Mage.Sets/src/mage/cards/d/DeathreapRitual.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Deathrender.java b/Mage.Sets/src/mage/cards/d/Deathrender.java index a2ddb5aec90..b0b0520e696 100644 --- a/Mage.Sets/src/mage/cards/d/Deathrender.java +++ b/Mage.Sets/src/mage/cards/d/Deathrender.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author Blinke diff --git a/Mage.Sets/src/mage/cards/d/DeathriteShaman.java b/Mage.Sets/src/mage/cards/d/DeathriteShaman.java index 481a17f82e6..82f93773aaf 100644 --- a/Mage.Sets/src/mage/cards/d/DeathriteShaman.java +++ b/Mage.Sets/src/mage/cards/d/DeathriteShaman.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +38,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; @@ -49,6 +47,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathsApproach.java b/Mage.Sets/src/mage/cards/d/DeathsApproach.java index f07af1a1f06..8d5af1ed4a7 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsApproach.java +++ b/Mage.Sets/src/mage/cards/d/DeathsApproach.java @@ -37,7 +37,10 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/d/DeathsCaress.java b/Mage.Sets/src/mage/cards/d/DeathsCaress.java index 52db13eea35..2b7d4e1c800 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsCaress.java +++ b/Mage.Sets/src/mage/cards/d/DeathsCaress.java @@ -27,20 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DeathsDuet.java b/Mage.Sets/src/mage/cards/d/DeathsDuet.java index 02b3b88b655..25de2885329 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsDuet.java +++ b/Mage.Sets/src/mage/cards/d/DeathsDuet.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeathsHeadBuzzard.java b/Mage.Sets/src/mage/cards/d/DeathsHeadBuzzard.java index 97f8e59ecf2..426d193e959 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsHeadBuzzard.java +++ b/Mage.Sets/src/mage/cards/d/DeathsHeadBuzzard.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeathsPresence.java b/Mage.Sets/src/mage/cards/d/DeathsPresence.java index f7ac018b374..a48ebfd5133 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsPresence.java +++ b/Mage.Sets/src/mage/cards/d/DeathsPresence.java @@ -28,7 +28,6 @@ package mage.cards.d; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; @@ -43,6 +42,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeathsShadow.java b/Mage.Sets/src/mage/cards/d/DeathsShadow.java index 6c8a6892b89..494cdb443a0 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsShadow.java +++ b/Mage.Sets/src/mage/cards/d/DeathsShadow.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.ControllerLifeCount; @@ -37,9 +34,12 @@ import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java index 923b6188f92..fbce2c7d22d 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java +++ b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -50,6 +49,8 @@ import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java b/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java index d1608326fbe..2975de246fc 100644 --- a/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java +++ b/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DebtToTheDeathless.java b/Mage.Sets/src/mage/cards/d/DebtToTheDeathless.java index e0533acbce8..f38a46a8e3d 100644 --- a/Mage.Sets/src/mage/cards/d/DebtToTheDeathless.java +++ b/Mage.Sets/src/mage/cards/d/DebtToTheDeathless.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DebtorsKnell.java b/Mage.Sets/src/mage/cards/d/DebtorsKnell.java index e507a8d349d..0189d9f3a2c 100644 --- a/Mage.Sets/src/mage/cards/d/DebtorsKnell.java +++ b/Mage.Sets/src/mage/cards/d/DebtorsKnell.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java index 7bb434ca0e9..d30e0668b4e 100644 --- a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java +++ b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,10 +37,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DecayingSoil.java b/Mage.Sets/src/mage/cards/d/DecayingSoil.java index 2acd61d5193..e547e1d8568 100644 --- a/Mage.Sets/src/mage/cards/d/DecayingSoil.java +++ b/Mage.Sets/src/mage/cards/d/DecayingSoil.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -43,24 +42,22 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; -import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author cbt33, Nantuko (Nim Deathmantle) diff --git a/Mage.Sets/src/mage/cards/d/DeceiverExarch.java b/Mage.Sets/src/mage/cards/d/DeceiverExarch.java index 7605701a6f2..8fed12adc0c 100644 --- a/Mage.Sets/src/mage/cards/d/DeceiverExarch.java +++ b/Mage.Sets/src/mage/cards/d/DeceiverExarch.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,11 +36,15 @@ import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java b/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java index 27f0b7c4e3c..06358fc0d3b 100644 --- a/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java +++ b/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java @@ -27,29 +27,22 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CopyEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentCard; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Deception.java b/Mage.Sets/src/mage/cards/d/Deception.java index b4b75526160..f6986354494 100644 --- a/Mage.Sets/src/mage/cards/d/Deception.java +++ b/Mage.Sets/src/mage/cards/d/Deception.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Decimate.java b/Mage.Sets/src/mage/cards/d/Decimate.java index 5e99f1bf98c..1bd1952dd9e 100644 --- a/Mage.Sets/src/mage/cards/d/Decimate.java +++ b/Mage.Sets/src/mage/cards/d/Decimate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetEnchantmentPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author shieldal diff --git a/Mage.Sets/src/mage/cards/d/DecimatorOfTheProvinces.java b/Mage.Sets/src/mage/cards/d/DecimatorOfTheProvinces.java index ff790e6b860..90c9eb902c6 100644 --- a/Mage.Sets/src/mage/cards/d/DecimatorOfTheProvinces.java +++ b/Mage.Sets/src/mage/cards/d/DecimatorOfTheProvinces.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DecimatorWeb.java b/Mage.Sets/src/mage/cards/d/DecimatorWeb.java index 79fdeeba4cf..871286a8987 100644 --- a/Mage.Sets/src/mage/cards/d/DecimatorWeb.java +++ b/Mage.Sets/src/mage/cards/d/DecimatorWeb.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,10 +37,13 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Loki, nantuko diff --git a/Mage.Sets/src/mage/cards/d/DeclarationInStone.java b/Mage.Sets/src/mage/cards/d/DeclarationInStone.java index 990a770e33c..0270f549c31 100644 --- a/Mage.Sets/src/mage/cards/d/DeclarationInStone.java +++ b/Mage.Sets/src/mage/cards/d/DeclarationInStone.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -47,6 +44,10 @@ import mage.game.permanent.token.ClueArtifactToken; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java b/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java index afd5f0c8cad..959df83349c 100644 --- a/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java +++ b/Mage.Sets/src/mage/cards/d/DeclarationOfNaught.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DecoctionModule.java b/Mage.Sets/src/mage/cards/d/DecoctionModule.java index aa9ee67aa1c..3308e167f07 100644 --- a/Mage.Sets/src/mage/cards/d/DecoctionModule.java +++ b/Mage.Sets/src/mage/cards/d/DecoctionModule.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/Decommission.java b/Mage.Sets/src/mage/cards/d/Decommission.java index a7e5ed8c673..ff5761f5de4 100644 --- a/Mage.Sets/src/mage/cards/d/Decommission.java +++ b/Mage.Sets/src/mage/cards/d/Decommission.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; import mage.watchers.common.RevoltWatcher; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/Decompose.java b/Mage.Sets/src/mage/cards/d/Decompose.java index 6f88772aa43..4dceecffe6b 100644 --- a/Mage.Sets/src/mage/cards/d/Decompose.java +++ b/Mage.Sets/src/mage/cards/d/Decompose.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.target.common.TargetCardInASingleGraveyard; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/d/Deconstruct.java b/Mage.Sets/src/mage/cards/d/Deconstruct.java index 1edd68dd507..395db0546f1 100644 --- a/Mage.Sets/src/mage/cards/d/Deconstruct.java +++ b/Mage.Sets/src/mage/cards/d/Deconstruct.java @@ -27,17 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java b/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java index 2d728288d16..2ac7615c61f 100644 --- a/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java +++ b/Mage.Sets/src/mage/cards/d/DecoratedGriffin.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfAnnihilation.java b/Mage.Sets/src/mage/cards/d/DecreeOfAnnihilation.java index dc94e855e64..8d2998961b1 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfAnnihilation.java +++ b/Mage.Sets/src/mage/cards/d/DecreeOfAnnihilation.java @@ -27,25 +27,26 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.abilities.Ability; -import mage.abilities.common.CycleTriggeredAbility; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DestroyAllEffect; -import mage.abilities.keyword.CyclingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.filter.FilterPermanent; -import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.game.Game; -import mage.game.permanent.Permanent; -import mage.players.Player; + import mage.abilities.Ability; + import mage.abilities.common.CycleTriggeredAbility; + import mage.abilities.costs.mana.ManaCostsImpl; + import mage.abilities.effects.OneShotEffect; + import mage.abilities.effects.common.DestroyAllEffect; + import mage.abilities.keyword.CyclingAbility; + import mage.cards.Card; + import mage.cards.CardImpl; + import mage.cards.CardSetInfo; + import mage.constants.CardType; + import mage.constants.Outcome; + import mage.filter.FilterPermanent; + import mage.filter.common.FilterLandPermanent; + import mage.filter.predicate.Predicates; + import mage.filter.predicate.mageobject.CardTypePredicate; + import mage.game.Game; + import mage.game.permanent.Permanent; + import mage.players.Player; + + import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java b/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java index a812b8ff22b..bf64a70ff94 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java +++ b/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -48,6 +47,8 @@ import mage.game.permanent.token.SoldierToken; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfPain.java b/Mage.Sets/src/mage/cards/d/DecreeOfPain.java index 0fab56920ef..7a3dca7a06b 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfPain.java +++ b/Mage.Sets/src/mage/cards/d/DecreeOfPain.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfSavagery.java b/Mage.Sets/src/mage/cards/d/DecreeOfSavagery.java index 9b6e4eea081..bf2410d44f6 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfSavagery.java +++ b/Mage.Sets/src/mage/cards/d/DecreeOfSavagery.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java b/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java index c42c25c6fd5..15b7c6c5e7b 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java +++ b/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.common.SpellCastOpponentTriggeredAbility; @@ -48,6 +47,8 @@ import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DedicatedMartyr.java b/Mage.Sets/src/mage/cards/d/DedicatedMartyr.java index 11af8c99c7c..8c201ddbd33 100644 --- a/Mage.Sets/src/mage/cards/d/DedicatedMartyr.java +++ b/Mage.Sets/src/mage/cards/d/DedicatedMartyr.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/d/DeepAnalysis.java b/Mage.Sets/src/mage/cards/d/DeepAnalysis.java index cb0c6752c77..2ee9737fa34 100644 --- a/Mage.Sets/src/mage/cards/d/DeepAnalysis.java +++ b/Mage.Sets/src/mage/cards/d/DeepAnalysis.java @@ -27,7 +27,7 @@ */ package mage.cards.d; -import mage.constants.CardType; +import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; import mage.abilities.costs.CostsImpl; import mage.abilities.costs.common.PayLifeCost; @@ -36,11 +36,11 @@ import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.TargetPlayer; import java.util.UUID; -import mage.abilities.costs.Cost; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java b/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java index 595649e31b4..bf77e601c1a 100644 --- a/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java +++ b/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.FlashbackAbility; @@ -38,6 +37,8 @@ import mage.constants.TimingRule; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java b/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java index ef091c2825e..a3d02b31773 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java +++ b/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.condition.common.SuspendedCondition; @@ -46,6 +45,8 @@ import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java b/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java index 92c13d56def..fb9da7d9fcd 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java +++ b/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java b/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java index a3ed9deebf4..fc523803581 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java +++ b/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java b/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java index 069ac2bcdbb..02e9f41843c 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java +++ b/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DeepSpawn.java b/Mage.Sets/src/mage/cards/d/DeepSpawn.java index 83fc08a90b5..0d1fd898353 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSpawn.java +++ b/Mage.Sets/src/mage/cards/d/DeepSpawn.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -48,6 +47,8 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DeepcavernImp.java b/Mage.Sets/src/mage/cards/d/DeepcavernImp.java index 1f5fa402fba..e9bb35325de 100644 --- a/Mage.Sets/src/mage/cards/d/DeepcavernImp.java +++ b/Mage.Sets/src/mage/cards/d/DeepcavernImp.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.keyword.EchoAbility; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java b/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java index 6fbf8b918ab..85b535eef10 100644 --- a/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java +++ b/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java @@ -27,19 +27,20 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java b/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java index 6b502cd9a72..ad4d886c882 100644 --- a/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java +++ b/Mage.Sets/src/mage/cards/d/DeepfathomSkulker.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -47,6 +46,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeepfireElemental.java b/Mage.Sets/src/mage/cards/d/DeepfireElemental.java index fa3b71d6304..cbf0ae18991 100644 --- a/Mage.Sets/src/mage/cards/d/DeepfireElemental.java +++ b/Mage.Sets/src/mage/cards/d/DeepfireElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeepglowSkate.java b/Mage.Sets/src/mage/cards/d/DeepglowSkate.java index e41dcc62239..38f0b3041a0 100644 --- a/Mage.Sets/src/mage/cards/d/DeepglowSkate.java +++ b/Mage.Sets/src/mage/cards/d/DeepglowSkate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java b/Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java index 470c6938fb0..126e9965bc4 100644 --- a/Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java +++ b/Mage.Sets/src/mage/cards/d/DeeptreadMerrow.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -35,6 +34,10 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DeepwaterHypnotist.java b/Mage.Sets/src/mage/cards/d/DeepwaterHypnotist.java index 063990348a6..54fd73eae46 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwaterHypnotist.java +++ b/Mage.Sets/src/mage/cards/d/DeepwaterHypnotist.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java b/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java index 77f4c052831..a5b4b0d74c7 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodDrummer.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java b/Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java index e1f7d047355..79c88f5dee0 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodGhoul.java @@ -27,17 +27,17 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java b/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java index 2a666d70db8..dca7edda604 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.CompoundCondition; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodTantiv.java b/Mage.Sets/src/mage/cards/d/DeepwoodTantiv.java index c1395239bd0..667e8445075 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodTantiv.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodTantiv.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodWolverine.java b/Mage.Sets/src/mage/cards/d/DeepwoodWolverine.java index dc7d34bac69..01e63ce9cf5 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodWolverine.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodWolverine.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Defang.java b/Mage.Sets/src/mage/cards/d/Defang.java index 32b1ee4ad17..91bd0251929 100644 --- a/Mage.Sets/src/mage/cards/d/Defang.java +++ b/Mage.Sets/src/mage/cards/d/Defang.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/d/Defeat.java b/Mage.Sets/src/mage/cards/d/Defeat.java index 2167f049233..0fb7c81a961 100644 --- a/Mage.Sets/src/mage/cards/d/Defeat.java +++ b/Mage.Sets/src/mage/cards/d/Defeat.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DefendTheHearth.java b/Mage.Sets/src/mage/cards/d/DefendTheHearth.java index 12eef3e3adc..1c14d0403aa 100644 --- a/Mage.Sets/src/mage/cards/d/DefendTheHearth.java +++ b/Mage.Sets/src/mage/cards/d/DefendTheHearth.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.PreventAllDamageToPlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DefenderEnVec.java b/Mage.Sets/src/mage/cards/d/DefenderEnVec.java index 5108aa9a446..c29defb50dd 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderEnVec.java +++ b/Mage.Sets/src/mage/cards/d/DefenderEnVec.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DefenderOfChaos.java b/Mage.Sets/src/mage/cards/d/DefenderOfChaos.java index 0b699454245..4cac938124c 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderOfChaos.java +++ b/Mage.Sets/src/mage/cards/d/DefenderOfChaos.java @@ -27,13 +27,13 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DefenderOfLaw.java b/Mage.Sets/src/mage/cards/d/DefenderOfLaw.java index dd49cf79ef0..ce0438b7f16 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderOfLaw.java +++ b/Mage.Sets/src/mage/cards/d/DefenderOfLaw.java @@ -27,13 +27,13 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java b/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java index 6e432c0c65f..e06a62c6ca1 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java +++ b/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DefenseGrid.java b/Mage.Sets/src/mage/cards/d/DefenseGrid.java index 120abbb45be..7498a653ff6 100644 --- a/Mage.Sets/src/mage/cards/d/DefenseGrid.java +++ b/Mage.Sets/src/mage/cards/d/DefenseGrid.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; @@ -36,6 +35,7 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DefensiveStance.java b/Mage.Sets/src/mage/cards/d/DefensiveStance.java index d70d4619f08..a95f459867a 100644 --- a/Mage.Sets/src/mage/cards/d/DefensiveStance.java +++ b/Mage.Sets/src/mage/cards/d/DefensiveStance.java @@ -27,20 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DefiantBloodlord.java b/Mage.Sets/src/mage/cards/d/DefiantBloodlord.java index 8a2fb58e48b..78504d89df2 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantBloodlord.java +++ b/Mage.Sets/src/mage/cards/d/DefiantBloodlord.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.LoseLifeTargetEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DefiantElf.java b/Mage.Sets/src/mage/cards/d/DefiantElf.java index 4fc4ab82b51..123d748f973 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantElf.java +++ b/Mage.Sets/src/mage/cards/d/DefiantElf.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java index 3722ad9dbff..2145527294f 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java +++ b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DefiantOgre.java b/Mage.Sets/src/mage/cards/d/DefiantOgre.java index 391972d2f44..92712de71a9 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantOgre.java +++ b/Mage.Sets/src/mage/cards/d/DefiantOgre.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DefiantSalvager.java b/Mage.Sets/src/mage/cards/d/DefiantSalvager.java index 7a754c33198..8c4a878301a 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantSalvager.java +++ b/Mage.Sets/src/mage/cards/d/DefiantSalvager.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DefiantStrike.java b/Mage.Sets/src/mage/cards/d/DefiantStrike.java index 766cf08dd45..1a13db1163b 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantStrike.java +++ b/Mage.Sets/src/mage/cards/d/DefiantStrike.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DefilerOfSouls.java b/Mage.Sets/src/mage/cards/d/DefilerOfSouls.java index 401d7e9b70f..f52686ee2a1 100644 --- a/Mage.Sets/src/mage/cards/d/DefilerOfSouls.java +++ b/Mage.Sets/src/mage/cards/d/DefilerOfSouls.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -37,6 +34,10 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.MonocoloredPredicate; import mage.game.Game; @@ -45,6 +46,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DefilingTears.java b/Mage.Sets/src/mage/cards/d/DefilingTears.java index 85716af6c29..0397fb8b675 100644 --- a/Mage.Sets/src/mage/cards/d/DefilingTears.java +++ b/Mage.Sets/src/mage/cards/d/DefilingTears.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Derpthemeus diff --git a/Mage.Sets/src/mage/cards/d/DeflectingPalm.java b/Mage.Sets/src/mage/cards/d/DeflectingPalm.java index b5492fa960e..2688181f892 100644 --- a/Mage.Sets/src/mage/cards/d/DeflectingPalm.java +++ b/Mage.Sets/src/mage/cards/d/DeflectingPalm.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectData; @@ -44,6 +43,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSource; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Deflection.java b/Mage.Sets/src/mage/cards/d/Deflection.java index 8c1d6786de8..d6a1e55fd99 100644 --- a/Mage.Sets/src/mage/cards/d/Deflection.java +++ b/Mage.Sets/src/mage/cards/d/Deflection.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ChooseNewTargetsTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.NumberOfTargetsPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeftDismissal.java b/Mage.Sets/src/mage/cards/d/DeftDismissal.java index 9b92521b6bb..6cda826788c 100644 --- a/Mage.Sets/src/mage/cards/d/DeftDismissal.java +++ b/Mage.Sets/src/mage/cards/d/DeftDismissal.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DeftDuelist.java b/Mage.Sets/src/mage/cards/d/DeftDuelist.java index de01077b74b..163686af6e6 100644 --- a/Mage.Sets/src/mage/cards/d/DeftDuelist.java +++ b/Mage.Sets/src/mage/cards/d/DeftDuelist.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeftbladeElite.java b/Mage.Sets/src/mage/cards/d/DeftbladeElite.java index 68bdadbe342..f777b0a48a5 100644 --- a/Mage.Sets/src/mage/cards/d/DeftbladeElite.java +++ b/Mage.Sets/src/mage/cards/d/DeftbladeElite.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DefyDeath.java b/Mage.Sets/src/mage/cards/d/DefyDeath.java index b8427e4c9cf..b565bbf18c0 100644 --- a/Mage.Sets/src/mage/cards/d/DefyDeath.java +++ b/Mage.Sets/src/mage/cards/d/DefyDeath.java @@ -27,20 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DefyGravity.java b/Mage.Sets/src/mage/cards/d/DefyGravity.java index 73e2bf86856..22eadfd02d3 100644 --- a/Mage.Sets/src/mage/cards/d/DefyGravity.java +++ b/Mage.Sets/src/mage/cards/d/DefyGravity.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlashbackAbility; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DegaDisciple.java b/Mage.Sets/src/mage/cards/d/DegaDisciple.java index a269aa44bbe..d2d7ab391f8 100644 --- a/Mage.Sets/src/mage/cards/d/DegaDisciple.java +++ b/Mage.Sets/src/mage/cards/d/DegaDisciple.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,8 +35,14 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Degavolver.java b/Mage.Sets/src/mage/cards/d/Degavolver.java index 19147aab700..094fd3d31a1 100644 --- a/Mage.Sets/src/mage/cards/d/Degavolver.java +++ b/Mage.Sets/src/mage/cards/d/Degavolver.java @@ -27,11 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -45,8 +40,13 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Deglamer.java b/Mage.Sets/src/mage/cards/d/Deglamer.java index d56aad440fc..a5037335b17 100644 --- a/Mage.Sets/src/mage/cards/d/Deglamer.java +++ b/Mage.Sets/src/mage/cards/d/Deglamer.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ShuffleIntoLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dehydration.java b/Mage.Sets/src/mage/cards/d/Dehydration.java index 583bdc0fd6a..c508aaf7227 100644 --- a/Mage.Sets/src/mage/cards/d/Dehydration.java +++ b/Mage.Sets/src/mage/cards/d/Dehydration.java @@ -27,19 +27,20 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/Deicide.java b/Mage.Sets/src/mage/cards/d/Deicide.java index d065005b79d..46c4c58eaee 100644 --- a/Mage.Sets/src/mage/cards/d/Deicide.java +++ b/Mage.Sets/src/mage/cards/d/Deicide.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.search.SearchTargetGraveyardHandLibraryForCardNameAndExileEffect; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DeityOfScars.java b/Mage.Sets/src/mage/cards/d/DeityOfScars.java index ef298357767..91b7790b483 100644 --- a/Mage.Sets/src/mage/cards/d/DeityOfScars.java +++ b/Mage.Sets/src/mage/cards/d/DeityOfScars.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/DejaVu.java b/Mage.Sets/src/mage/cards/d/DejaVu.java index b2d226d24c1..8bfb5773a61 100644 --- a/Mage.Sets/src/mage/cards/d/DejaVu.java +++ b/Mage.Sets/src/mage/cards/d/DejaVu.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/Delay.java b/Mage.Sets/src/mage/cards/d/Delay.java index 0960d08733d..5cb526eba29 100644 --- a/Mage.Sets/src/mage/cards/d/Delay.java +++ b/Mage.Sets/src/mage/cards/d/Delay.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.Effect; @@ -47,6 +46,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DelayingShield.java b/Mage.Sets/src/mage/cards/d/DelayingShield.java index fb11e22afd1..0e14ee1fadc 100644 --- a/Mage.Sets/src/mage/cards/d/DelayingShield.java +++ b/Mage.Sets/src/mage/cards/d/DelayingShield.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,11 +38,7 @@ import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.DamageEvent; @@ -52,6 +47,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DelifsCone.java b/Mage.Sets/src/mage/cards/d/DelifsCone.java index 6d2655852a3..d8b63a5ffc3 100644 --- a/Mage.Sets/src/mage/cards/d/DelifsCone.java +++ b/Mage.Sets/src/mage/cards/d/DelifsCone.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/d/DelifsCube.java b/Mage.Sets/src/mage/cards/d/DelifsCube.java index 265415b85d9..4c38e2e6748 100644 --- a/Mage.Sets/src/mage/cards/d/DelifsCube.java +++ b/Mage.Sets/src/mage/cards/d/DelifsCube.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/d/DeliriumSkeins.java b/Mage.Sets/src/mage/cards/d/DeliriumSkeins.java index fee174245f3..7dbf2f7105d 100644 --- a/Mage.Sets/src/mage/cards/d/DeliriumSkeins.java +++ b/Mage.Sets/src/mage/cards/d/DeliriumSkeins.java @@ -27,11 +27,12 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/Deluge.java b/Mage.Sets/src/mage/cards/d/Deluge.java index a9b68f7041c..3185d07fbc9 100644 --- a/Mage.Sets/src/mage/cards/d/Deluge.java +++ b/Mage.Sets/src/mage/cards/d/Deluge.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.TapAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/d/DelusionsOfMediocrity.java b/Mage.Sets/src/mage/cards/d/DelusionsOfMediocrity.java index 9b92a9a1eb5..9a24e8e13b5 100644 --- a/Mage.Sets/src/mage/cards/d/DelusionsOfMediocrity.java +++ b/Mage.Sets/src/mage/cards/d/DelusionsOfMediocrity.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/d/DelverOfSecrets.java b/Mage.Sets/src/mage/cards/d/DelverOfSecrets.java index 9a15b7c558e..0d4e97c0bbc 100644 --- a/Mage.Sets/src/mage/cards/d/DelverOfSecrets.java +++ b/Mage.Sets/src/mage/cards/d/DelverOfSecrets.java @@ -27,21 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; +import mage.cards.*; import mage.cards.i.InsectileAberration; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; @@ -49,6 +44,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Alvin diff --git a/Mage.Sets/src/mage/cards/d/Dematerialize.java b/Mage.Sets/src/mage/cards/d/Dematerialize.java index d120302dd7d..81bce6156e4 100644 --- a/Mage.Sets/src/mage/cards/d/Dematerialize.java +++ b/Mage.Sets/src/mage/cards/d/Dematerialize.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/d/DementiaBat.java b/Mage.Sets/src/mage/cards/d/DementiaBat.java index bc2398aeb4b..e899fc87d98 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaBat.java +++ b/Mage.Sets/src/mage/cards/d/DementiaBat.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,8 +35,12 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DementiaSliver.java b/Mage.Sets/src/mage/cards/d/DementiaSliver.java index a199b17ff3f..b9ec9188937 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaSliver.java +++ b/Mage.Sets/src/mage/cards/d/DementiaSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -38,11 +37,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.NameACardEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -53,6 +48,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DemigodOfRevenge.java b/Mage.Sets/src/mage/cards/d/DemigodOfRevenge.java index de5a7ce4c04..0185fb5196a 100644 --- a/Mage.Sets/src/mage/cards/d/DemigodOfRevenge.java +++ b/Mage.Sets/src/mage/cards/d/DemigodOfRevenge.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Demolish.java b/Mage.Sets/src/mage/cards/d/Demolish.java index adc0c2719ba..c4b7277aedb 100644 --- a/Mage.Sets/src/mage/cards/d/Demolish.java +++ b/Mage.Sets/src/mage/cards/d/Demolish.java @@ -28,16 +28,17 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DemolitionStomper.java b/Mage.Sets/src/mage/cards/d/DemolitionStomper.java index b27f97ea995..ece4bac1da4 100644 --- a/Mage.Sets/src/mage/cards/d/DemolitionStomper.java +++ b/Mage.Sets/src/mage/cards/d/DemolitionStomper.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -40,6 +39,8 @@ import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java b/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java index 578be6379f6..2b24b02e36b 100644 --- a/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java +++ b/Mage.Sets/src/mage/cards/d/DemonOfDarkSchemes.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -48,6 +47,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DemonOfDeathsGate.java b/Mage.Sets/src/mage/cards/d/DemonOfDeathsGate.java index 520c9326b1c..5480d96191d 100644 --- a/Mage.Sets/src/mage/cards/d/DemonOfDeathsGate.java +++ b/Mage.Sets/src/mage/cards/d/DemonOfDeathsGate.java @@ -28,7 +28,6 @@ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostSourceAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DemonOfWailingAgonies.java b/Mage.Sets/src/mage/cards/d/DemonOfWailingAgonies.java index 7c33892e87a..792e81509d7 100644 --- a/Mage.Sets/src/mage/cards/d/DemonOfWailingAgonies.java +++ b/Mage.Sets/src/mage/cards/d/DemonOfWailingAgonies.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.abilityword.LieutenantAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DemonPossessedWitch.java b/Mage.Sets/src/mage/cards/d/DemonPossessedWitch.java index 7cc4409c5c5..bec8350caf0 100644 --- a/Mage.Sets/src/mage/cards/d/DemonPossessedWitch.java +++ b/Mage.Sets/src/mage/cards/d/DemonPossessedWitch.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DestroyTargetEffect; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Demonfire.java b/Mage.Sets/src/mage/cards/d/Demonfire.java index b994ca89c4c..dfa5711b622 100644 --- a/Mage.Sets/src/mage/cards/d/Demonfire.java +++ b/Mage.Sets/src/mage/cards/d/Demonfire.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.HellbentCondition; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author JotaPeRL diff --git a/Mage.Sets/src/mage/cards/d/DemonicAppetite.java b/Mage.Sets/src/mage/cards/d/DemonicAppetite.java index 4885a5c7ebc..653a1d15833 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicAppetite.java +++ b/Mage.Sets/src/mage/cards/d/DemonicAppetite.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,15 +37,13 @@ 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.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DemonicCollusion.java b/Mage.Sets/src/mage/cards/d/DemonicCollusion.java index 4b9bd8defd3..b71e35d7d17 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicCollusion.java +++ b/Mage.Sets/src/mage/cards/d/DemonicCollusion.java @@ -27,17 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DemonicConsultation.java b/Mage.Sets/src/mage/cards/d/DemonicConsultation.java index fd0a61754b3..4ab6265a18e 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicConsultation.java +++ b/Mage.Sets/src/mage/cards/d/DemonicConsultation.java @@ -27,15 +27,10 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; @@ -45,6 +40,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DemonicDread.java b/Mage.Sets/src/mage/cards/d/DemonicDread.java index 95deb8a39cb..3cc8a7bbe46 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicDread.java +++ b/Mage.Sets/src/mage/cards/d/DemonicDread.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DemonicHordes.java b/Mage.Sets/src/mage/cards/d/DemonicHordes.java index 1019b6d7468..4c551c4ae9d 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicHordes.java +++ b/Mage.Sets/src/mage/cards/d/DemonicHordes.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -53,6 +52,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DemonicPact.java b/Mage.Sets/src/mage/cards/d/DemonicPact.java index ef3306e780a..5197cfd25a3 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicPact.java +++ b/Mage.Sets/src/mage/cards/d/DemonicPact.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.TargetController; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DemonicRising.java b/Mage.Sets/src/mage/cards/d/DemonicRising.java index 248d7660577..80376054e1a 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicRising.java +++ b/Mage.Sets/src/mage/cards/d/DemonicRising.java @@ -27,17 +27,18 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.condition.common.CreatureCountCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.game.permanent.token.DemonToken; -import java.util.UUID; -import mage.abilities.condition.common.CreatureCountCondition; +import mage.constants.CardType; import mage.constants.TargetController; +import mage.game.permanent.token.DemonToken; + +import java.util.UUID; /** * @author noxx diff --git a/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java b/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java index a35581fec06..ec27a2c0237 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; diff --git a/Mage.Sets/src/mage/cards/d/DemonicTorment.java b/Mage.Sets/src/mage/cards/d/DemonicTorment.java index a64af83d5ca..1f55471bcf2 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTorment.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTorment.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -36,14 +35,12 @@ import mage.abilities.effects.common.combat.CantAttackAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DemonicTutor.java b/Mage.Sets/src/mage/cards/d/DemonicTutor.java index 5c31be0db2c..a3cd2a33e08 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTutor.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTutor.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java b/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java index 5ec9914125b..046d63f3c54 100644 --- a/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java +++ b/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java b/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java index 61269eee21e..01ba28ee497 100644 --- a/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java +++ b/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java @@ -27,19 +27,19 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.SacrificeTargetCost; 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.Outcome; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/d/DemonsGrasp.java b/Mage.Sets/src/mage/cards/d/DemonsGrasp.java index d886d6a9149..4a35fab2bf0 100644 --- a/Mage.Sets/src/mage/cards/d/DemonsGrasp.java +++ b/Mage.Sets/src/mage/cards/d/DemonsGrasp.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DemonsHerald.java b/Mage.Sets/src/mage/cards/d/DemonsHerald.java index 1b3ddd3e46e..6493a55b8b3 100644 --- a/Mage.Sets/src/mage/cards/d/DemonsHerald.java +++ b/Mage.Sets/src/mage/cards/d/DemonsHerald.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +37,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DemonsHorn.java b/Mage.Sets/src/mage/cards/d/DemonsHorn.java index e2f88216813..5d265b3d1a4 100644 --- a/Mage.Sets/src/mage/cards/d/DemonsHorn.java +++ b/Mage.Sets/src/mage/cards/d/DemonsHorn.java @@ -28,17 +28,18 @@ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; -import mage.constants.CardType; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DemonsJester.java b/Mage.Sets/src/mage/cards/d/DemonsJester.java index 13c1f1873ec..8e9d8f66f71 100644 --- a/Mage.Sets/src/mage/cards/d/DemonsJester.java +++ b/Mage.Sets/src/mage/cards/d/DemonsJester.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HellbentCondition; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author daagar diff --git a/Mage.Sets/src/mage/cards/d/DemonspineWhip.java b/Mage.Sets/src/mage/cards/d/DemonspineWhip.java index a10e00bf475..ec1423b2d92 100644 --- a/Mage.Sets/src/mage/cards/d/DemonspineWhip.java +++ b/Mage.Sets/src/mage/cards/d/DemonspineWhip.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,9 +38,14 @@ import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/Demoralize.java b/Mage.Sets/src/mage/cards/d/Demoralize.java index 3ff2a11c32f..427c0df5ea1 100644 --- a/Mage.Sets/src/mage/cards/d/Demoralize.java +++ b/Mage.Sets/src/mage/cards/d/Demoralize.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.AddContinuousEffectToGame; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/d/Demystify.java b/Mage.Sets/src/mage/cards/d/Demystify.java index cf7ee225929..bb51e0b0acc 100644 --- a/Mage.Sets/src/mage/cards/d/Demystify.java +++ b/Mage.Sets/src/mage/cards/d/Demystify.java @@ -28,13 +28,14 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DenProtector.java b/Mage.Sets/src/mage/cards/d/DenProtector.java index ae954b7b2a0..fcb1f6231a7 100644 --- a/Mage.Sets/src/mage/cards/d/DenProtector.java +++ b/Mage.Sets/src/mage/cards/d/DenProtector.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java b/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java index 583d998b933..cf40920a92b 100644 --- a/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java +++ b/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DenseCanopy.java b/Mage.Sets/src/mage/cards/d/DenseCanopy.java index b73fb0ceb83..11ed4b8bf3f 100644 --- a/Mage.Sets/src/mage/cards/d/DenseCanopy.java +++ b/Mage.Sets/src/mage/cards/d/DenseCanopy.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DenseFoliage.java b/Mage.Sets/src/mage/cards/d/DenseFoliage.java index f088987c108..71c2da4201e 100644 --- a/Mage.Sets/src/mage/cards/d/DenseFoliage.java +++ b/Mage.Sets/src/mage/cards/d/DenseFoliage.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CantBeTargetedAllEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DenyExistence.java b/Mage.Sets/src/mage/cards/d/DenyExistence.java index d9886eea0c0..f05ba116674 100644 --- a/Mage.Sets/src/mage/cards/d/DenyExistence.java +++ b/Mage.Sets/src/mage/cards/d/DenyExistence.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureSpell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DenyReality.java b/Mage.Sets/src/mage/cards/d/DenyReality.java index 9ba03ad01e8..74d994ab6de 100644 --- a/Mage.Sets/src/mage/cards/d/DenyReality.java +++ b/Mage.Sets/src/mage/cards/d/DenyReality.java @@ -28,14 +28,15 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DenyingWind.java b/Mage.Sets/src/mage/cards/d/DenyingWind.java index 087b5379449..2705441842c 100644 --- a/Mage.Sets/src/mage/cards/d/DenyingWind.java +++ b/Mage.Sets/src/mage/cards/d/DenyingWind.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -43,6 +41,9 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java b/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java index 7cabd1d5643..949ea88af56 100644 --- a/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java +++ b/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedSourceTriggeredAbility; @@ -42,10 +41,7 @@ import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -53,6 +49,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 @@ -61,7 +59,7 @@ public class DepalaPilotExemplar extends CardImpl { public DepalaPilotExemplar(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dwarf"); this.subtype.add("Pilot"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java b/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java index d9042c27e77..162614ff963 100644 --- a/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java +++ b/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java @@ -27,14 +27,9 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -44,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DeployTheTroops.java b/Mage.Sets/src/mage/cards/d/DeployTheTroops.java index 7b5beeba9cb..99037246aba 100644 --- a/Mage.Sets/src/mage/cards/d/DeployTheTroops.java +++ b/Mage.Sets/src/mage/cards/d/DeployTheTroops.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.TrooperToken; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DeployToTheFront.java b/Mage.Sets/src/mage/cards/d/DeployToTheFront.java index 89aa7a72b46..6818267dad7 100644 --- a/Mage.Sets/src/mage/cards/d/DeployToTheFront.java +++ b/Mage.Sets/src/mage/cards/d/DeployToTheFront.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.SoldierToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Deprive.java b/Mage.Sets/src/mage/cards/d/Deprive.java index 8b201bc9dce..ac8375fb4b9 100644 --- a/Mage.Sets/src/mage/cards/d/Deprive.java +++ b/Mage.Sets/src/mage/cards/d/Deprive.java @@ -28,17 +28,18 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DeputizedProtester.java b/Mage.Sets/src/mage/cards/d/DeputizedProtester.java index 8ddae93a6df..c1bb7d7bd2f 100644 --- a/Mage.Sets/src/mage/cards/d/DeputizedProtester.java +++ b/Mage.Sets/src/mage/cards/d/DeputizedProtester.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.MenaceAbility; import mage.abilities.keyword.MeleeAbility; +import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java b/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java index eff2fc640c7..6e094710bc0 100644 --- a/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java +++ b/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,12 +34,16 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DerangedAssistant.java b/Mage.Sets/src/mage/cards/d/DerangedAssistant.java index 8b8d06b0975..cc51fcc96c9 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedAssistant.java +++ b/Mage.Sets/src/mage/cards/d/DerangedAssistant.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.common.PutTopCardOfYourLibraryToGraveyardCost; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DerangedHermit.java b/Mage.Sets/src/mage/cards/d/DerangedHermit.java index b3c087b880e..62f7f33c900 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedHermit.java +++ b/Mage.Sets/src/mage/cards/d/DerangedHermit.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,10 +35,15 @@ import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SquirrelToken; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DerangedOutcast.java b/Mage.Sets/src/mage/cards/d/DerangedOutcast.java index d627c51dd68..efc11c02444 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedOutcast.java +++ b/Mage.Sets/src/mage/cards/d/DerangedOutcast.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +35,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; @@ -45,6 +43,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DerangedWhelp.java b/Mage.Sets/src/mage/cards/d/DerangedWhelp.java index 002c78f12d9..08adbfc0844 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedWhelp.java +++ b/Mage.Sets/src/mage/cards/d/DerangedWhelp.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Derelor.java b/Mage.Sets/src/mage/cards/d/Derelor.java index 12852f8fb53..4bd7a476655 100644 --- a/Mage.Sets/src/mage/cards/d/Derelor.java +++ b/Mage.Sets/src/mage/cards/d/Derelor.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DereviEmpyrialTactician.java b/Mage.Sets/src/mage/cards/d/DereviEmpyrialTactician.java index 326b6be9e99..e0b461de6dd 100644 --- a/Mage.Sets/src/mage/cards/d/DereviEmpyrialTactician.java +++ b/Mage.Sets/src/mage/cards/d/DereviEmpyrialTactician.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -51,6 +51,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +61,7 @@ public class DereviEmpyrialTactician extends CardImpl { public DereviEmpyrialTactician(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Bird"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/d/DescendUponTheSinful.java b/Mage.Sets/src/mage/cards/d/DescendUponTheSinful.java index f3b4094cf90..d3cdec8d40a 100644 --- a/Mage.Sets/src/mage/cards/d/DescendUponTheSinful.java +++ b/Mage.Sets/src/mage/cards/d/DescendUponTheSinful.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.AngelToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java index 2ab93fcadc3..e80da5d9a5b 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java +++ b/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfMasumaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfMasumaro.java index 5412a84808b..5b49d6cee5e 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfMasumaro.java +++ b/Mage.Sets/src/mage/cards/d/DescendantOfMasumaro.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java index f3cc1b0edc5..c98478d22af 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java +++ b/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +35,10 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DescendantsPath.java b/Mage.Sets/src/mage/cards/d/DescendantsPath.java index 6cc36053f63..7cb0a463b91 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantsPath.java +++ b/Mage.Sets/src/mage/cards/d/DescendantsPath.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +35,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; @@ -46,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/d/DescentIntoMadness.java b/Mage.Sets/src/mage/cards/d/DescentIntoMadness.java index d2bcc20378e..e07212c0534 100644 --- a/Mage.Sets/src/mage/cards/d/DescentIntoMadness.java +++ b/Mage.Sets/src/mage/cards/d/DescentIntoMadness.java @@ -27,31 +27,34 @@ */ package mage.cards.d; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.CardIdPredicate; +import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import mage.players.PlayerList; import mage.target.Target; import mage.target.TargetCard; import mage.target.common.TargetControlledPermanent; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; import java.util.UUID; -import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.permanent.PermanentIdPredicate; -import mage.players.PlayerList; /** * 5/1/2012 For each despair counter on Descent into Madness, you'll exile a permanent diff --git a/Mage.Sets/src/mage/cards/d/DesecratedEarth.java b/Mage.Sets/src/mage/cards/d/DesecratedEarth.java index bed6b7f383f..b50dadafe50 100644 --- a/Mage.Sets/src/mage/cards/d/DesecratedEarth.java +++ b/Mage.Sets/src/mage/cards/d/DesecratedEarth.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DesecrationDemon.java b/Mage.Sets/src/mage/cards/d/DesecrationDemon.java index 4e33319d83a..86ed9f4433c 100644 --- a/Mage.Sets/src/mage/cards/d/DesecrationDemon.java +++ b/Mage.Sets/src/mage/cards/d/DesecrationDemon.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -38,6 +34,8 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; @@ -48,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DesecrationElemental.java b/Mage.Sets/src/mage/cards/d/DesecrationElemental.java index b862dc97cbc..e868562f256 100644 --- a/Mage.Sets/src/mage/cards/d/DesecrationElemental.java +++ b/Mage.Sets/src/mage/cards/d/DesecrationElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.effects.common.SacrificeControllerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DesecrationPlague.java b/Mage.Sets/src/mage/cards/d/DesecrationPlague.java index 97d2d312315..8b143974e5c 100644 --- a/Mage.Sets/src/mage/cards/d/DesecrationPlague.java +++ b/Mage.Sets/src/mage/cards/d/DesecrationPlague.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DesecratorHag.java b/Mage.Sets/src/mage/cards/d/DesecratorHag.java index bd6adecef0f..a21262077ed 100644 --- a/Mage.Sets/src/mage/cards/d/DesecratorHag.java +++ b/Mage.Sets/src/mage/cards/d/DesecratorHag.java @@ -27,16 +27,11 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -45,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/Desert.java b/Mage.Sets/src/mage/cards/d/Desert.java index 3ea37794a48..125ee864a1d 100644 --- a/Mage.Sets/src/mage/cards/d/Desert.java +++ b/Mage.Sets/src/mage/cards/d/Desert.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.IsStepCondition; import mage.abilities.costs.common.TapSourceCost; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DesertDrake.java b/Mage.Sets/src/mage/cards/d/DesertDrake.java index d6cb8c13fae..e8874c767f2 100644 --- a/Mage.Sets/src/mage/cards/d/DesertDrake.java +++ b/Mage.Sets/src/mage/cards/d/DesertDrake.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DesertNomads.java b/Mage.Sets/src/mage/cards/d/DesertNomads.java index 92eb9b5e0aa..99e18ef32e7 100644 --- a/Mage.Sets/src/mage/cards/d/DesertNomads.java +++ b/Mage.Sets/src/mage/cards/d/DesertNomads.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/d/DesertSandstorm.java b/Mage.Sets/src/mage/cards/d/DesertSandstorm.java index 929772d3f2d..0eae81e55db 100644 --- a/Mage.Sets/src/mage/cards/d/DesertSandstorm.java +++ b/Mage.Sets/src/mage/cards/d/DesertSandstorm.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DesertTwister.java b/Mage.Sets/src/mage/cards/d/DesertTwister.java index 08ebd5b6eb3..b6cb528fd40 100644 --- a/Mage.Sets/src/mage/cards/d/DesertTwister.java +++ b/Mage.Sets/src/mage/cards/d/DesertTwister.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.constants.CardType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/d/DesertedTemple.java b/Mage.Sets/src/mage/cards/d/DesertedTemple.java index ea733363f17..a0b97b4f022 100644 --- a/Mage.Sets/src/mage/cards/d/DesertedTemple.java +++ b/Mage.Sets/src/mage/cards/d/DesertedTemple.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DesertersQuarters.java b/Mage.Sets/src/mage/cards/d/DesertersQuarters.java index 8a4d14120e8..bca2e741112 100644 --- a/Mage.Sets/src/mage/cards/d/DesertersQuarters.java +++ b/Mage.Sets/src/mage/cards/d/DesertersQuarters.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SkipUntapOptionalAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Desertion.java b/Mage.Sets/src/mage/cards/d/Desertion.java index 4eb49331c8b..e94fca2d5ff 100644 --- a/Mage.Sets/src/mage/cards/d/Desertion.java +++ b/Mage.Sets/src/mage/cards/d/Desertion.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -43,6 +40,10 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java b/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java index b2754181646..d2bbbe80373 100644 --- a/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java +++ b/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DesolationAngel.java b/Mage.Sets/src/mage/cards/d/DesolationAngel.java index d834bae7c6e..6de8b95a9f6 100644 --- a/Mage.Sets/src/mage/cards/d/DesolationAngel.java +++ b/Mage.Sets/src/mage/cards/d/DesolationAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; @@ -42,6 +41,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/DesolationGiant.java b/Mage.Sets/src/mage/cards/d/DesolationGiant.java index bd07f232f7b..156e84e3a54 100644 --- a/Mage.Sets/src/mage/cards/d/DesolationGiant.java +++ b/Mage.Sets/src/mage/cards/d/DesolationGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DesolationTwin.java b/Mage.Sets/src/mage/cards/d/DesolationTwin.java index a29fd4fb902..528ad36515b 100644 --- a/Mage.Sets/src/mage/cards/d/DesolationTwin.java +++ b/Mage.Sets/src/mage/cards/d/DesolationTwin.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.Token; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DesperateCharge.java b/Mage.Sets/src/mage/cards/d/DesperateCharge.java index 7c472141e18..436af75c832 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateCharge.java +++ b/Mage.Sets/src/mage/cards/d/DesperateCharge.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DesperateRavings.java b/Mage.Sets/src/mage/cards/d/DesperateRavings.java index dbe5e40dfad..30e5e114eca 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateRavings.java +++ b/Mage.Sets/src/mage/cards/d/DesperateRavings.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TimingRule; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -39,9 +35,14 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TimingRule; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DesperateRitual.java b/Mage.Sets/src/mage/cards/d/DesperateRitual.java index 71b9c94f7cf..2cc951031d3 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateRitual.java +++ b/Mage.Sets/src/mage/cards/d/DesperateRitual.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.keyword.SpliceOntoArcaneAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DesperateSentry.java b/Mage.Sets/src/mage/cards/d/DesperateSentry.java index b7c891fb5f6..8c7ae21f61a 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateSentry.java +++ b/Mage.Sets/src/mage/cards/d/DesperateSentry.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.EldraziHorrorToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DesperateStand.java b/Mage.Sets/src/mage/cards/d/DesperateStand.java index 83aa8b34521..ff3f86ca9e7 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateStand.java +++ b/Mage.Sets/src/mage/cards/d/DesperateStand.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.abilityword.StriveAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Despise.java b/Mage.Sets/src/mage/cards/d/Despise.java index 8b66d565288..ccd2332392f 100644 --- a/Mage.Sets/src/mage/cards/d/Despise.java +++ b/Mage.Sets/src/mage/cards/d/Despise.java @@ -27,17 +27,17 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Despoil.java b/Mage.Sets/src/mage/cards/d/Despoil.java index 6a6f74c8b9b..13372f5463d 100644 --- a/Mage.Sets/src/mage/cards/d/Despoil.java +++ b/Mage.Sets/src/mage/cards/d/Despoil.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LoseLifeTargetControllerEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DespoilerOfSouls.java b/Mage.Sets/src/mage/cards/d/DespoilerOfSouls.java index 111c9d6d286..7306f7a83f4 100644 --- a/Mage.Sets/src/mage/cards/d/DespoilerOfSouls.java +++ b/Mage.Sets/src/mage/cards/d/DespoilerOfSouls.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Despondency.java b/Mage.Sets/src/mage/cards/d/Despondency.java index 383f1c8b4f1..dfb6151f035 100644 --- a/Mage.Sets/src/mage/cards/d/Despondency.java +++ b/Mage.Sets/src/mage/cards/d/Despondency.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author hanasu diff --git a/Mage.Sets/src/mage/cards/d/DespoticScepter.java b/Mage.Sets/src/mage/cards/d/DespoticScepter.java index eccd268dbad..21dfe830553 100644 --- a/Mage.Sets/src/mage/cards/d/DespoticScepter.java +++ b/Mage.Sets/src/mage/cards/d/DespoticScepter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.other.OwnerPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DestroyTheEvidence.java b/Mage.Sets/src/mage/cards/d/DestroyTheEvidence.java index 1fc45c695c9..8f404c7b426 100644 --- a/Mage.Sets/src/mage/cards/d/DestroyTheEvidence.java +++ b/Mage.Sets/src/mage/cards/d/DestroyTheEvidence.java @@ -27,25 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DestructiveFlow.java b/Mage.Sets/src/mage/cards/d/DestructiveFlow.java index c560638bca4..1e7369e7513 100644 --- a/Mage.Sets/src/mage/cards/d/DestructiveFlow.java +++ b/Mage.Sets/src/mage/cards/d/DestructiveFlow.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DestructiveForce.java b/Mage.Sets/src/mage/cards/d/DestructiveForce.java index 858dfe9bcc9..57507ad5187 100644 --- a/Mage.Sets/src/mage/cards/d/DestructiveForce.java +++ b/Mage.Sets/src/mage/cards/d/DestructiveForce.java @@ -28,17 +28,18 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DestructiveRevelry.java b/Mage.Sets/src/mage/cards/d/DestructiveRevelry.java index 8cad2a2da9f..2cf3760331d 100644 --- a/Mage.Sets/src/mage/cards/d/DestructiveRevelry.java +++ b/Mage.Sets/src/mage/cards/d/DestructiveRevelry.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DestructiveTampering.java b/Mage.Sets/src/mage/cards/d/DestructiveTampering.java index 6883136dfb8..43ee1c3e938 100644 --- a/Mage.Sets/src/mage/cards/d/DestructiveTampering.java +++ b/Mage.Sets/src/mage/cards/d/DestructiveTampering.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.combat.CantBlockAllEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/d/DestructorDragon.java b/Mage.Sets/src/mage/cards/d/DestructorDragon.java index 8b3d643dea1..4e44b2f60db 100644 --- a/Mage.Sets/src/mage/cards/d/DestructorDragon.java +++ b/Mage.Sets/src/mage/cards/d/DestructorDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DetentionSphere.java b/Mage.Sets/src/mage/cards/d/DetentionSphere.java index 7802e440487..5d210a54f33 100644 --- a/Mage.Sets/src/mage/cards/d/DetentionSphere.java +++ b/Mage.Sets/src/mage/cards/d/DetentionSphere.java @@ -27,11 +27,7 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; @@ -39,6 +35,8 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; @@ -50,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** diff --git a/Mage.Sets/src/mage/cards/d/Detonate.java b/Mage.Sets/src/mage/cards/d/Detonate.java index db0297979d4..1e92e25b327 100644 --- a/Mage.Sets/src/mage/cards/d/Detonate.java +++ b/Mage.Sets/src/mage/cards/d/Detonate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.dynamicvalue.common.ManacostVariableValue; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/Detritivore.java b/Mage.Sets/src/mage/cards/d/Detritivore.java index 6903cc1bc85..f1939e42977 100644 --- a/Mage.Sets/src/mage/cards/d/Detritivore.java +++ b/Mage.Sets/src/mage/cards/d/Detritivore.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; @@ -54,6 +54,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -127,7 +129,7 @@ class NonBasicLandsInOpponentsGraveyards implements DynamicValue { static { filter.add(new CardTypePredicate(CardType.LAND)); - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); } diff --git a/Mage.Sets/src/mage/cards/d/DeusOfCalamity.java b/Mage.Sets/src/mage/cards/d/DeusOfCalamity.java index c232cbde473..e96d73a344d 100644 --- a/Mage.Sets/src/mage/cards/d/DeusOfCalamity.java +++ b/Mage.Sets/src/mage/cards/d/DeusOfCalamity.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DestroyTargetEffect; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent.EventType; import mage.target.Target; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Devastate.java b/Mage.Sets/src/mage/cards/d/Devastate.java index f59bf1c6cd1..6e1ab06d33a 100644 --- a/Mage.Sets/src/mage/cards/d/Devastate.java +++ b/Mage.Sets/src/mage/cards/d/Devastate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DevastatingDreams.java b/Mage.Sets/src/mage/cards/d/DevastatingDreams.java index a4c62f9b1b0..dfd3e5f414f 100644 --- a/Mage.Sets/src/mage/cards/d/DevastatingDreams.java +++ b/Mage.Sets/src/mage/cards/d/DevastatingDreams.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.VariableCostImpl; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/Devastation.java b/Mage.Sets/src/mage/cards/d/Devastation.java index 50cfc21f25a..1329bfdb859 100644 --- a/Mage.Sets/src/mage/cards/d/Devastation.java +++ b/Mage.Sets/src/mage/cards/d/Devastation.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DevastationTide.java b/Mage.Sets/src/mage/cards/d/DevastationTide.java index 413a35a3241..09da3aea846 100644 --- a/Mage.Sets/src/mage/cards/d/DevastationTide.java +++ b/Mage.Sets/src/mage/cards/d/DevastationTide.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect; import mage.abilities.keyword.MiracleAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterNonlandPermanent; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/d/DeviantGlee.java b/Mage.Sets/src/mage/cards/d/DeviantGlee.java index a6c7c354f27..44350cd79c0 100644 --- a/Mage.Sets/src/mage/cards/d/DeviantGlee.java +++ b/Mage.Sets/src/mage/cards/d/DeviantGlee.java @@ -28,7 +28,6 @@ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,14 +40,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DevilsPlay.java b/Mage.Sets/src/mage/cards/d/DevilsPlay.java index ff231f363c4..0b4f60ed470 100644 --- a/Mage.Sets/src/mage/cards/d/DevilsPlay.java +++ b/Mage.Sets/src/mage/cards/d/DevilsPlay.java @@ -27,18 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DevilsPlayground.java b/Mage.Sets/src/mage/cards/d/DevilsPlayground.java index aba8268be22..9dacdab7bc6 100644 --- a/Mage.Sets/src/mage/cards/d/DevilsPlayground.java +++ b/Mage.Sets/src/mage/cards/d/DevilsPlayground.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.DevilToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DevilthornFox.java b/Mage.Sets/src/mage/cards/d/DevilthornFox.java index d3b09986dec..131f10e16fc 100644 --- a/Mage.Sets/src/mage/cards/d/DevilthornFox.java +++ b/Mage.Sets/src/mage/cards/d/DevilthornFox.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java b/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java index 2627cdaae6d..08eb3a9aa46 100644 --- a/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java +++ b/Mage.Sets/src/mage/cards/d/DevotedCaretaker.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki (Ursapine), LevelX2 (Eight-and-a-Half Tails), cbt diff --git a/Mage.Sets/src/mage/cards/d/DevotedDruid.java b/Mage.Sets/src/mage/cards/d/DevotedDruid.java index 2900c9e4f8e..1518f14a8d2 100644 --- a/Mage.Sets/src/mage/cards/d/DevotedDruid.java +++ b/Mage.Sets/src/mage/cards/d/DevotedDruid.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PutCountersSourceCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DevotedHero.java b/Mage.Sets/src/mage/cards/d/DevotedHero.java index a15a08d907a..31f1a8926ee 100644 --- a/Mage.Sets/src/mage/cards/d/DevotedHero.java +++ b/Mage.Sets/src/mage/cards/d/DevotedHero.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DevotedRetainer.java b/Mage.Sets/src/mage/cards/d/DevotedRetainer.java index 2fe52fdab20..89ccaeeed82 100644 --- a/Mage.Sets/src/mage/cards/d/DevotedRetainer.java +++ b/Mage.Sets/src/mage/cards/d/DevotedRetainer.java @@ -28,12 +28,13 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DevourFlesh.java b/Mage.Sets/src/mage/cards/d/DevourFlesh.java index e36060141ab..ce3a74d85bc 100644 --- a/Mage.Sets/src/mage/cards/d/DevourFlesh.java +++ b/Mage.Sets/src/mage/cards/d/DevourFlesh.java @@ -27,14 +27,12 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -43,6 +41,8 @@ import mage.target.Target; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DevourInFlames.java b/Mage.Sets/src/mage/cards/d/DevourInFlames.java index b85e7a593c9..cf804a964e8 100644 --- a/Mage.Sets/src/mage/cards/d/DevourInFlames.java +++ b/Mage.Sets/src/mage/cards/d/DevourInFlames.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlaneswalker; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DevourInShadow.java b/Mage.Sets/src/mage/cards/d/DevourInShadow.java index 51262edc4fe..c5c5c4f4fce 100644 --- a/Mage.Sets/src/mage/cards/d/DevourInShadow.java +++ b/Mage.Sets/src/mage/cards/d/DevourInShadow.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DevouringDeep.java b/Mage.Sets/src/mage/cards/d/DevouringDeep.java index 66f8439d46c..b1ff1f10e5c 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringDeep.java +++ b/Mage.Sets/src/mage/cards/d/DevouringDeep.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DevouringGreed.java b/Mage.Sets/src/mage/cards/d/DevouringGreed.java index b6802b54129..aba420ed719 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringGreed.java +++ b/Mage.Sets/src/mage/cards/d/DevouringGreed.java @@ -27,15 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -43,6 +42,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DevouringLight.java b/Mage.Sets/src/mage/cards/d/DevouringLight.java index eb343e9b21b..bb76b04dd9b 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringLight.java +++ b/Mage.Sets/src/mage/cards/d/DevouringLight.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DevouringRage.java b/Mage.Sets/src/mage/cards/d/DevouringRage.java index ca3ab1b941d..4e1badea7a0 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringRage.java +++ b/Mage.Sets/src/mage/cards/d/DevouringRage.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,7 +35,9 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -48,6 +46,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DevouringStrossus.java b/Mage.Sets/src/mage/cards/d/DevouringStrossus.java index cb4ed052f38..688ea136adf 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringStrossus.java +++ b/Mage.Sets/src/mage/cards/d/DevouringStrossus.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DevouringSwarm.java b/Mage.Sets/src/mage/cards/d/DevouringSwarm.java index 8275dc321bd..c17d6b5204d 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringSwarm.java +++ b/Mage.Sets/src/mage/cards/d/DevouringSwarm.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java index 03d543b62e6..73988462889 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java +++ b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +35,8 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -46,6 +45,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * @author noxx diff --git a/Mage.Sets/src/mage/cards/d/DevoutHarpist.java b/Mage.Sets/src/mage/cards/d/DevoutHarpist.java index ffecd0f8802..746e0c9bfef 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutHarpist.java +++ b/Mage.Sets/src/mage/cards/d/DevoutHarpist.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DevoutInvocation.java b/Mage.Sets/src/mage/cards/d/DevoutInvocation.java index 05854067354..623580b1c44 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutInvocation.java +++ b/Mage.Sets/src/mage/cards/d/DevoutInvocation.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -45,6 +41,11 @@ import mage.game.permanent.token.AngelToken; import mage.players.Player; import mage.target.TargetPermanent; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DevoutLightcaster.java b/Mage.Sets/src/mage/cards/d/DevoutLightcaster.java index 6d2519eec47..77de07a9053 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutLightcaster.java +++ b/Mage.Sets/src/mage/cards/d/DevoutLightcaster.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,10 +34,13 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DevoutMonk.java b/Mage.Sets/src/mage/cards/d/DevoutMonk.java index 0b637915422..6145174f717 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutMonk.java +++ b/Mage.Sets/src/mage/cards/d/DevoutMonk.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DevoutWitness.java b/Mage.Sets/src/mage/cards/d/DevoutWitness.java index ce8a70d3fd1..05be2896d14 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutWitness.java +++ b/Mage.Sets/src/mage/cards/d/DevoutWitness.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DewdropSpy.java b/Mage.Sets/src/mage/cards/d/DewdropSpy.java index 9c3b2275494..d745e7f4fd0 100644 --- a/Mage.Sets/src/mage/cards/d/DewdropSpy.java +++ b/Mage.Sets/src/mage/cards/d/DewdropSpy.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DhundOperative.java b/Mage.Sets/src/mage/cards/d/DhundOperative.java index 50e059d78b9..4ed700d2b7d 100644 --- a/Mage.Sets/src/mage/cards/d/DhundOperative.java +++ b/Mage.Sets/src/mage/cards/d/DhundOperative.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DiabolicEdict.java b/Mage.Sets/src/mage/cards/d/DiabolicEdict.java index 7ee67e26e17..e73cfb78eb6 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicEdict.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicEdict.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DiabolicIntent.java b/Mage.Sets/src/mage/cards/d/DiabolicIntent.java index a1af2e6f48a..0d6d64f2a5a 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicIntent.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicIntent.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DiabolicMachine.java b/Mage.Sets/src/mage/cards/d/DiabolicMachine.java index 6ec3070d0c7..f35b827c558 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicMachine.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicMachine.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/d/DiabolicRevelation.java b/Mage.Sets/src/mage/cards/d/DiabolicRevelation.java index a594e4c4cbb..acff292b117 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicRevelation.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicRevelation.java @@ -27,22 +27,22 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DiabolicServitude.java b/Mage.Sets/src/mage/cards/d/DiabolicServitude.java index b07ed4e620c..e5990106ca6 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicServitude.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicServitude.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -52,6 +51,8 @@ import mage.game.events.ZoneChangeEvent; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DiabolicTutor.java b/Mage.Sets/src/mage/cards/d/DiabolicTutor.java index c56baee7f63..ce6fff02723 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicTutor.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicTutor.java @@ -28,13 +28,14 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DiamondFaerie.java b/Mage.Sets/src/mage/cards/d/DiamondFaerie.java index 72a26196d32..095c40b53cb 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondFaerie.java +++ b/Mage.Sets/src/mage/cards/d/DiamondFaerie.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author LoneFox @@ -55,7 +57,7 @@ public class DiamondFaerie extends CardImpl { public DiamondFaerie(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}{U}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Faerie"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java index 2ad5e1e9317..f5e188466bb 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java +++ b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.PrismToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DiamondValley.java b/Mage.Sets/src/mage/cards/d/DiamondValley.java index a275d513d40..af4d63d954b 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondValley.java +++ b/Mage.Sets/src/mage/cards/d/DiamondValley.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DiaochanArtfulBeauty.java b/Mage.Sets/src/mage/cards/d/DiaochanArtfulBeauty.java index 00f50eb31d4..1b45e92080f 100644 --- a/Mage.Sets/src/mage/cards/d/DiaochanArtfulBeauty.java +++ b/Mage.Sets/src/mage/cards/d/DiaochanArtfulBeauty.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -46,6 +46,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponentsChoicePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class DiaochanArtfulBeauty extends CardImpl { public DiaochanArtfulBeauty(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/d/DictateOfErebos.java b/Mage.Sets/src/mage/cards/d/DictateOfErebos.java index 87cb1a626f4..48afbfa998d 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfErebos.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfErebos.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.SacrificeOpponentsEffect; import mage.abilities.keyword.FlashAbility; @@ -39,6 +38,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java b/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java index 51e5aac6c42..47f1ab89d13 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.FlashAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java b/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java index 363e44b134d..04710394a08 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.TapForManaAllTriggeredManaAbility; import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect; import mage.abilities.keyword.FlashAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.SetTargetPointer; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DictateOfKruphix.java b/Mage.Sets/src/mage/cards/d/DictateOfKruphix.java index 5c9f198e563..a05d8b8b917 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfKruphix.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfKruphix.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.keyword.FlashAbility; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java b/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java index 8e4814dbcd9..656b51ab2e2 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Didgeridoo.java b/Mage.Sets/src/mage/cards/d/Didgeridoo.java index a34a364fce4..081baed532c 100644 --- a/Mage.Sets/src/mage/cards/d/Didgeridoo.java +++ b/Mage.Sets/src/mage/cards/d/Didgeridoo.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DieYoung.java b/Mage.Sets/src/mage/cards/d/DieYoung.java index 8b5c4037aba..36b80fcdde7 100644 --- a/Mage.Sets/src/mage/cards/d/DieYoung.java +++ b/Mage.Sets/src/mage/cards/d/DieYoung.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.PayEnergyCost; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DiffusionSliver.java b/Mage.Sets/src/mage/cards/d/DiffusionSliver.java index 4a5eb089d74..a0560d77471 100644 --- a/Mage.Sets/src/mage/cards/d/DiffusionSliver.java +++ b/Mage.Sets/src/mage/cards/d/DiffusionSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.TargetStackObject; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DigThroughTime.java b/Mage.Sets/src/mage/cards/d/DigThroughTime.java index 6c67940f530..705edef213b 100644 --- a/Mage.Sets/src/mage/cards/d/DigThroughTime.java +++ b/Mage.Sets/src/mage/cards/d/DigThroughTime.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.abilities.keyword.DelveAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java b/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java index f845de87996..23f646734ba 100644 --- a/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java +++ b/Mage.Sets/src/mage/cards/d/DiligentFarmhand.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java b/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java index cb84ea95cd8..3356bde8e1e 100644 --- a/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java +++ b/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -55,6 +54,8 @@ import mage.target.Target; import mage.target.common.TargetCardInOpponentsGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DimensionalInfiltrator.java b/Mage.Sets/src/mage/cards/d/DimensionalInfiltrator.java index fb2fc88583a..de0a3704ccb 100644 --- a/Mage.Sets/src/mage/cards/d/DimensionalInfiltrator.java +++ b/Mage.Sets/src/mage/cards/d/DimensionalInfiltrator.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Diminish.java b/Mage.Sets/src/mage/cards/d/Diminish.java index 4e3c25360b4..6a65f745fbe 100644 --- a/Mage.Sets/src/mage/cards/d/Diminish.java +++ b/Mage.Sets/src/mage/cards/d/Diminish.java @@ -28,14 +28,15 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.SetPowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DiminishingReturns.java b/Mage.Sets/src/mage/cards/d/DiminishingReturns.java index c20aff85926..b4ba571cd9f 100644 --- a/Mage.Sets/src/mage/cards/d/DiminishingReturns.java +++ b/Mage.Sets/src/mage/cards/d/DiminishingReturns.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DimirAqueduct.java b/Mage.Sets/src/mage/cards/d/DimirAqueduct.java index d184bc3fdc2..03ba8ffb1a5 100644 --- a/Mage.Sets/src/mage/cards/d/DimirAqueduct.java +++ b/Mage.Sets/src/mage/cards/d/DimirAqueduct.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/DimirCharm.java b/Mage.Sets/src/mage/cards/d/DimirCharm.java index 0d4f999b50c..19962f744c7 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCharm.java +++ b/Mage.Sets/src/mage/cards/d/DimirCharm.java @@ -27,17 +27,12 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -54,6 +49,8 @@ import mage.target.TargetPlayer; import mage.target.TargetSpell; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DimirCluestone.java b/Mage.Sets/src/mage/cards/d/DimirCluestone.java index 7f5d23bf2a7..0262eeceab8 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCluestone.java +++ b/Mage.Sets/src/mage/cards/d/DimirCluestone.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +38,10 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DimirCutpurse.java b/Mage.Sets/src/mage/cards/d/DimirCutpurse.java index 157b9c360c3..3e1809e4ad5 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCutpurse.java +++ b/Mage.Sets/src/mage/cards/d/DimirCutpurse.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java b/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java index cb3b53b07c4..f81ac333125 100644 --- a/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java +++ b/Mage.Sets/src/mage/cards/d/DimirDoppelganger.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -35,11 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CopyEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -52,6 +47,8 @@ import mage.players.Player; import mage.target.common.TargetCardInGraveyard; import mage.util.functions.ApplyToPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DimirGuildgate.java b/Mage.Sets/src/mage/cards/d/DimirGuildgate.java index 395c4e9e424..2389ca3ebac 100644 --- a/Mage.Sets/src/mage/cards/d/DimirGuildgate.java +++ b/Mage.Sets/src/mage/cards/d/DimirGuildgate.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DimirGuildmage.java b/Mage.Sets/src/mage/cards/d/DimirGuildmage.java index d7d75b7adb9..0b7c9b90fe2 100644 --- a/Mage.Sets/src/mage/cards/d/DimirGuildmage.java +++ b/Mage.Sets/src/mage/cards/d/DimirGuildmage.java @@ -27,20 +27,20 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DimirHouseGuard.java b/Mage.Sets/src/mage/cards/d/DimirHouseGuard.java index 643bdb6dd8b..6efa31b8c3f 100644 --- a/Mage.Sets/src/mage/cards/d/DimirHouseGuard.java +++ b/Mage.Sets/src/mage/cards/d/DimirHouseGuard.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,9 +35,12 @@ import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DimirInfiltrator.java b/Mage.Sets/src/mage/cards/d/DimirInfiltrator.java index ac8df59dc1d..3f09ab90e7d 100644 --- a/Mage.Sets/src/mage/cards/d/DimirInfiltrator.java +++ b/Mage.Sets/src/mage/cards/d/DimirInfiltrator.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.TransmuteAbility; import mage.abilities.keyword.CantBeBlockedSourceAbility; +import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DimirMachinations.java b/Mage.Sets/src/mage/cards/d/DimirMachinations.java index 7493efb1906..5b0b613ab9e 100644 --- a/Mage.Sets/src/mage/cards/d/DimirMachinations.java +++ b/Mage.Sets/src/mage/cards/d/DimirMachinations.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TransmuteAbility; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DimirSignet.java b/Mage.Sets/src/mage/cards/d/DimirSignet.java index 28402752382..44c6e78b9ea 100644 --- a/Mage.Sets/src/mage/cards/d/DimirSignet.java +++ b/Mage.Sets/src/mage/cards/d/DimirSignet.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +35,10 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java index 1350cb42340..edc69d1620c 100644 --- a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java +++ b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DingusEgg.java b/Mage.Sets/src/mage/cards/d/DingusEgg.java index 3b4675aa087..00e068e164e 100644 --- a/Mage.Sets/src/mage/cards/d/DingusEgg.java +++ b/Mage.Sets/src/mage/cards/d/DingusEgg.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DinrovaHorror.java b/Mage.Sets/src/mage/cards/d/DinrovaHorror.java index 60420670001..7dc9fdab664 100644 --- a/Mage.Sets/src/mage/cards/d/DinrovaHorror.java +++ b/Mage.Sets/src/mage/cards/d/DinrovaHorror.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DiplomacyOfTheWastes.java b/Mage.Sets/src/mage/cards/d/DiplomacyOfTheWastes.java index 2f39d657353..0c147959748 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomacyOfTheWastes.java +++ b/Mage.Sets/src/mage/cards/d/DiplomacyOfTheWastes.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterNonlandCard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java index d18418a78d7..b145801dc6a 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.TargetsPermanentPredicate; import mage.target.TargetStackObject; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java b/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java index d703328afee..52a5b2d5d4e 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DireUndercurrents.java b/Mage.Sets/src/mage/cards/d/DireUndercurrents.java index 6b10d57b402..023d9493690 100644 --- a/Mage.Sets/src/mage/cards/d/DireUndercurrents.java +++ b/Mage.Sets/src/mage/cards/d/DireUndercurrents.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java index c7ab9538b09..b3be879e223 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java index 4281ccec0b4..529c268e521 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.ZombieToken; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java index 3e62642ce26..f96d64e8635 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/d/DiregrafGhoul.java b/Mage.Sets/src/mage/cards/d/DiregrafGhoul.java index 58eb0d033a3..4c8d56257f3 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafGhoul.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafGhoul.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/d/DirgeOfDread.java b/Mage.Sets/src/mage/cards/d/DirgeOfDread.java index a3bd30267a1..2a3278924e8 100644 --- a/Mage.Sets/src/mage/cards/d/DirgeOfDread.java +++ b/Mage.Sets/src/mage/cards/d/DirgeOfDread.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DirgurNemesis.java b/Mage.Sets/src/mage/cards/d/DirgurNemesis.java index aa37f4a9937..9dc71cf49a2 100644 --- a/Mage.Sets/src/mage/cards/d/DirgurNemesis.java +++ b/Mage.Sets/src/mage/cards/d/DirgurNemesis.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.DefenderAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DirtcowlWurm.java b/Mage.Sets/src/mage/cards/d/DirtcowlWurm.java index e0ffc0cd881..a73b156bf8f 100644 --- a/Mage.Sets/src/mage/cards/d/DirtcowlWurm.java +++ b/Mage.Sets/src/mage/cards/d/DirtcowlWurm.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java b/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java index d614292cd12..3c655b31c48 100644 --- a/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java +++ b/Mage.Sets/src/mage/cards/d/DirtwaterWraith.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DirtyWererat.java b/Mage.Sets/src/mage/cards/d/DirtyWererat.java index 90435f8ff00..103e60667ef 100644 --- a/Mage.Sets/src/mage/cards/d/DirtyWererat.java +++ b/Mage.Sets/src/mage/cards/d/DirtyWererat.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/d/Disallow.java b/Mage.Sets/src/mage/cards/d/Disallow.java index 337b685a596..741e4ee850f 100644 --- a/Mage.Sets/src/mage/cards/d/Disallow.java +++ b/Mage.Sets/src/mage/cards/d/Disallow.java @@ -27,6 +27,7 @@ */ package mage.cards.d; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -34,7 +35,6 @@ import mage.constants.CardType; import mage.target.TargetStackObject; import java.util.UUID; -import mage.abilities.effects.Effect; /** * @author JRHerlehy diff --git a/Mage.Sets/src/mage/cards/d/DisappearingAct.java b/Mage.Sets/src/mage/cards/d/DisappearingAct.java index cd52dd30010..f5ae4ea9e94 100644 --- a/Mage.Sets/src/mage/cards/d/DisappearingAct.java +++ b/Mage.Sets/src/mage/cards/d/DisappearingAct.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Disarm.java b/Mage.Sets/src/mage/cards/d/Disarm.java index c454f000021..2ca5f190d39 100644 --- a/Mage.Sets/src/mage/cards/d/Disarm.java +++ b/Mage.Sets/src/mage/cards/d/Disarm.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Derpthemeus diff --git a/Mage.Sets/src/mage/cards/d/DisasterRadius.java b/Mage.Sets/src/mage/cards/d/DisasterRadius.java index 49715589bb5..db1e2d69f3d 100644 --- a/Mage.Sets/src/mage/cards/d/DisasterRadius.java +++ b/Mage.Sets/src/mage/cards/d/DisasterRadius.java @@ -27,16 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -44,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfBolas.java b/Mage.Sets/src/mage/cards/d/DiscipleOfBolas.java index 2ee3ea2d641..2fd39336ecd 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfBolas.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfBolas.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java b/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java index 559cdaa61ac..99e329d4022 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -50,6 +49,8 @@ import mage.players.Player; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java b/Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java index 9e8d3ef3460..48f6ea1eb7f 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java @@ -28,7 +28,6 @@ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,6 +35,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java b/Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java index a644cddb0a9..ac40ed593bb 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfGriselbrand.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +36,15 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java b/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java index fd9c5842fd0..f76aacf46ba 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfKangee.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java b/Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java index e3c41cab055..8dda5221b78 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java @@ -28,8 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +35,9 @@ import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java b/Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java index 76901256f9b..e8cb849c827 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfPhenax.java b/Mage.Sets/src/mage/cards/d/DiscipleOfPhenax.java index 8fc00a7a2ac..7bb50ffc3bc 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfPhenax.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfPhenax.java @@ -27,18 +27,12 @@ */ package mage.cards.d; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.DevotionCount; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Outcome; @@ -50,6 +44,9 @@ import mage.target.TargetCard; import mage.target.TargetPlayer; import mage.target.common.TargetCardInHand; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java index 0638385b923..f8e300e1297 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTeveshSzat.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java index 26d82e22ea1..e7d091bc31b 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTheOldWays.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java index 1c0d744fd03..7b06e392969 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -51,6 +50,8 @@ import mage.target.TargetSpell; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTheVault.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTheVault.java index 95c47148492..8426548d114 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTheVault.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTheVault.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ZoneChangeAllTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/Discombobulate.java b/Mage.Sets/src/mage/cards/d/Discombobulate.java index ad117f077df..79099badcd0 100644 --- a/Mage.Sets/src/mage/cards/d/Discombobulate.java +++ b/Mage.Sets/src/mage/cards/d/Discombobulate.java @@ -28,14 +28,15 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/d/DisdainfulStroke.java b/Mage.Sets/src/mage/cards/d/DisdainfulStroke.java index 317978c5e0f..510ae5db49d 100644 --- a/Mage.Sets/src/mage/cards/d/DisdainfulStroke.java +++ b/Mage.Sets/src/mage/cards/d/DisdainfulStroke.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DiseaseCarriers.java b/Mage.Sets/src/mage/cards/d/DiseaseCarriers.java index 7aebceec986..ab8334922c9 100644 --- a/Mage.Sets/src/mage/cards/d/DiseaseCarriers.java +++ b/Mage.Sets/src/mage/cards/d/DiseaseCarriers.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/Disembowel.java b/Mage.Sets/src/mage/cards/d/Disembowel.java index 15933c59d13..1d8064670a8 100644 --- a/Mage.Sets/src/mage/cards/d/Disembowel.java +++ b/Mage.Sets/src/mage/cards/d/Disembowel.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/Disenchant.java b/Mage.Sets/src/mage/cards/d/Disenchant.java index 56394f7befc..943e09f3bf7 100644 --- a/Mage.Sets/src/mage/cards/d/Disenchant.java +++ b/Mage.Sets/src/mage/cards/d/Disenchant.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Disentomb.java b/Mage.Sets/src/mage/cards/d/Disentomb.java index a9fabfd44ae..6a8c28d4b70 100644 --- a/Mage.Sets/src/mage/cards/d/Disentomb.java +++ b/Mage.Sets/src/mage/cards/d/Disentomb.java @@ -28,14 +28,15 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/Disfigure.java b/Mage.Sets/src/mage/cards/d/Disfigure.java index 82268d481b8..f5c10e5bfdc 100644 --- a/Mage.Sets/src/mage/cards/d/Disfigure.java +++ b/Mage.Sets/src/mage/cards/d/Disfigure.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Disintegrate.java b/Mage.Sets/src/mage/cards/d/Disintegrate.java index 53bbb0dcd9f..6454a2cfd48 100644 --- a/Mage.Sets/src/mage/cards/d/Disintegrate.java +++ b/Mage.Sets/src/mage/cards/d/Disintegrate.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -41,6 +39,8 @@ import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/d/DismalBackwater.java b/Mage.Sets/src/mage/cards/d/DismalBackwater.java index abb5ab66aa2..3c88b2b9180 100644 --- a/Mage.Sets/src/mage/cards/d/DismalBackwater.java +++ b/Mage.Sets/src/mage/cards/d/DismalBackwater.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DismalFailure.java b/Mage.Sets/src/mage/cards/d/DismalFailure.java index 8c0ed81fbc6..7248d92f4a0 100644 --- a/Mage.Sets/src/mage/cards/d/DismalFailure.java +++ b/Mage.Sets/src/mage/cards/d/DismalFailure.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DismantlingBlow.java b/Mage.Sets/src/mage/cards/d/DismantlingBlow.java index c6c820e46fb..38e8b84b0a9 100644 --- a/Mage.Sets/src/mage/cards/d/DismantlingBlow.java +++ b/Mage.Sets/src/mage/cards/d/DismantlingBlow.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dismember.java b/Mage.Sets/src/mage/cards/d/Dismember.java index 72db3fa5301..a18214ccb40 100644 --- a/Mage.Sets/src/mage/cards/d/Dismember.java +++ b/Mage.Sets/src/mage/cards/d/Dismember.java @@ -28,15 +28,15 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/d/Dismiss.java b/Mage.Sets/src/mage/cards/d/Dismiss.java index 050f8990990..6ccad3b447f 100644 --- a/Mage.Sets/src/mage/cards/d/Dismiss.java +++ b/Mage.Sets/src/mage/cards/d/Dismiss.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java index 1cc91a0ab6e..1e10a1e0e28 100644 --- a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java +++ b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -35,18 +34,14 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -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.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Disorder.java b/Mage.Sets/src/mage/cards/d/Disorder.java index dc4a4bd135f..21d2208ec49 100644 --- a/Mage.Sets/src/mage/cards/d/Disorder.java +++ b/Mage.Sets/src/mage/cards/d/Disorder.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/Disorient.java b/Mage.Sets/src/mage/cards/d/Disorient.java index 8f43602c55f..096bce8288f 100644 --- a/Mage.Sets/src/mage/cards/d/Disorient.java +++ b/Mage.Sets/src/mage/cards/d/Disorient.java @@ -28,14 +28,15 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DisownedAncestor.java b/Mage.Sets/src/mage/cards/d/DisownedAncestor.java index 85191480ef8..b0f2638b577 100644 --- a/Mage.Sets/src/mage/cards/d/DisownedAncestor.java +++ b/Mage.Sets/src/mage/cards/d/DisownedAncestor.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.OutlastAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dispatch.java b/Mage.Sets/src/mage/cards/d/Dispatch.java index 27e63083468..7a43a047c24 100644 --- a/Mage.Sets/src/mage/cards/d/Dispatch.java +++ b/Mage.Sets/src/mage/cards/d/Dispatch.java @@ -28,16 +28,17 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Dispel.java b/Mage.Sets/src/mage/cards/d/Dispel.java index b5e3f889ea7..22fee266428 100644 --- a/Mage.Sets/src/mage/cards/d/Dispel.java +++ b/Mage.Sets/src/mage/cards/d/Dispel.java @@ -27,15 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DispellersCapsule.java b/Mage.Sets/src/mage/cards/d/DispellersCapsule.java index 59934e086e4..3408231744e 100644 --- a/Mage.Sets/src/mage/cards/d/DispellersCapsule.java +++ b/Mage.Sets/src/mage/cards/d/DispellersCapsule.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -37,9 +34,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DispenseJustice.java b/Mage.Sets/src/mage/cards/d/DispenseJustice.java index e97d2be04ca..7a9d115ad9c 100644 --- a/Mage.Sets/src/mage/cards/d/DispenseJustice.java +++ b/Mage.Sets/src/mage/cards/d/DispenseJustice.java @@ -28,19 +28,20 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterAttackingCreature; import mage.game.Game; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/d/DispersalShield.java b/Mage.Sets/src/mage/cards/d/DispersalShield.java index 90b90754dfd..975392f3477 100644 --- a/Mage.Sets/src/mage/cards/d/DispersalShield.java +++ b/Mage.Sets/src/mage/cards/d/DispersalShield.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.HighestConvertedManaCostValue; @@ -42,6 +40,8 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/d/DispersalTechnician.java b/Mage.Sets/src/mage/cards/d/DispersalTechnician.java index e936755bf74..132b1273f7a 100644 --- a/Mage.Sets/src/mage/cards/d/DispersalTechnician.java +++ b/Mage.Sets/src/mage/cards/d/DispersalTechnician.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/d/Disperse.java b/Mage.Sets/src/mage/cards/d/Disperse.java index 69c0fcfaf84..9cac805845d 100644 --- a/Mage.Sets/src/mage/cards/d/Disperse.java +++ b/Mage.Sets/src/mage/cards/d/Disperse.java @@ -28,13 +28,14 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/d/DispersingOrb.java b/Mage.Sets/src/mage/cards/d/DispersingOrb.java index 9c2c0d4d8c0..fd51737bf62 100644 --- a/Mage.Sets/src/mage/cards/d/DispersingOrb.java +++ b/Mage.Sets/src/mage/cards/d/DispersingOrb.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Derpthemeus diff --git a/Mage.Sets/src/mage/cards/d/Displace.java b/Mage.Sets/src/mage/cards/d/Displace.java index ee2e1c822ca..9d29a20276a 100644 --- a/Mage.Sets/src/mage/cards/d/Displace.java +++ b/Mage.Sets/src/mage/cards/d/Displace.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DisplacementWave.java b/Mage.Sets/src/mage/cards/d/DisplacementWave.java index 16b55087277..6e5c0374c09 100644 --- a/Mage.Sets/src/mage/cards/d/DisplacementWave.java +++ b/Mage.Sets/src/mage/cards/d/DisplacementWave.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DisplayOfDominance.java b/Mage.Sets/src/mage/cards/d/DisplayOfDominance.java index bd5c93b5609..134b8cf8abd 100644 --- a/Mage.Sets/src/mage/cards/d/DisplayOfDominance.java +++ b/Mage.Sets/src/mage/cards/d/DisplayOfDominance.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; @@ -50,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Disrupt.java b/Mage.Sets/src/mage/cards/d/Disrupt.java index 8d249d43ebe..9b571fcfac6 100644 --- a/Mage.Sets/src/mage/cards/d/Disrupt.java +++ b/Mage.Sets/src/mage/cards/d/Disrupt.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DisruptingScepter.java b/Mage.Sets/src/mage/cards/d/DisruptingScepter.java index cafd4a3f88e..010432fb46f 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptingScepter.java +++ b/Mage.Sets/src/mage/cards/d/DisruptingScepter.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.condition.common.MyTurnCondition; @@ -38,9 +35,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DisruptingShoal.java b/Mage.Sets/src/mage/cards/d/DisruptingShoal.java index 135d930f682..01beb93ee31 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptingShoal.java +++ b/Mage.Sets/src/mage/cards/d/DisruptingShoal.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.Mode; @@ -50,6 +49,8 @@ import mage.game.stack.Spell; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DisruptionAura.java b/Mage.Sets/src/mage/cards/d/DisruptionAura.java index eef0f3820df..ac5b45e3ff3 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptionAura.java +++ b/Mage.Sets/src/mage/cards/d/DisruptionAura.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,11 +38,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -51,6 +46,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java index e5b8ffbc81e..87d25af6d0f 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java +++ b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DisruptiveStudent.java b/Mage.Sets/src/mage/cards/d/DisruptiveStudent.java index 6908e05e109..e69171152f8 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptiveStudent.java +++ b/Mage.Sets/src/mage/cards/d/DisruptiveStudent.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java b/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java index dc32156cd39..301b8b8add1 100644 --- a/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java +++ b/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.FightTargetsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.predicate.mageobject.AnotherTargetPredicate; import mage.filter.predicate.permanent.BlockingPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dissipate.java b/Mage.Sets/src/mage/cards/d/Dissipate.java index bbadb8fc571..4a130286c08 100644 --- a/Mage.Sets/src/mage/cards/d/Dissipate.java +++ b/Mage.Sets/src/mage/cards/d/Dissipate.java @@ -27,10 +27,10 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/cards/d/DissipationField.java b/Mage.Sets/src/mage/cards/d/DissipationField.java index 592643e6729..93783e5b133 100644 --- a/Mage.Sets/src/mage/cards/d/DissipationField.java +++ b/Mage.Sets/src/mage/cards/d/DissipationField.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author ayratn diff --git a/Mage.Sets/src/mage/cards/d/Dissolve.java b/Mage.Sets/src/mage/cards/d/Dissolve.java index 2c2ecdb9bfc..b1f5c24a531 100644 --- a/Mage.Sets/src/mage/cards/d/Dissolve.java +++ b/Mage.Sets/src/mage/cards/d/Dissolve.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.target.Target; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DistantMelody.java b/Mage.Sets/src/mage/cards/d/DistantMelody.java index ecd0c88bc88..95b64f2e0e5 100644 --- a/Mage.Sets/src/mage/cards/d/DistantMelody.java +++ b/Mage.Sets/src/mage/cards/d/DistantMelody.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DistantMemories.java b/Mage.Sets/src/mage/cards/d/DistantMemories.java index 65e205fc481..b6f02d9500b 100644 --- a/Mage.Sets/src/mage/cards/d/DistantMemories.java +++ b/Mage.Sets/src/mage/cards/d/DistantMemories.java @@ -27,20 +27,21 @@ */ package mage.cards.d; -import java.util.Set; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.Set; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java b/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java index abff2196f66..c30e53328f1 100644 --- a/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java +++ b/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DistendedMindbender.java b/Mage.Sets/src/mage/cards/d/DistendedMindbender.java index 6258693423a..7a9c0fb364e 100644 --- a/Mage.Sets/src/mage/cards/d/DistendedMindbender.java +++ b/Mage.Sets/src/mage/cards/d/DistendedMindbender.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; @@ -51,6 +49,9 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetOpponent; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DistortingLens.java b/Mage.Sets/src/mage/cards/d/DistortingLens.java index f0b67486661..20e663150cf 100644 --- a/Mage.Sets/src/mage/cards/d/DistortingLens.java +++ b/Mage.Sets/src/mage/cards/d/DistortingLens.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/d/DistortingWake.java b/Mage.Sets/src/mage/cards/d/DistortingWake.java index 3b83318f41d..5537d1d8a96 100644 --- a/Mage.Sets/src/mage/cards/d/DistortingWake.java +++ b/Mage.Sets/src/mage/cards/d/DistortingWake.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.target.Target; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DistortionStrike.java b/Mage.Sets/src/mage/cards/d/DistortionStrike.java index e6ba85f95b7..0a0ff889f39 100644 --- a/Mage.Sets/src/mage/cards/d/DistortionStrike.java +++ b/Mage.Sets/src/mage/cards/d/DistortionStrike.java @@ -27,17 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/Distress.java b/Mage.Sets/src/mage/cards/d/Distress.java index 39530e31e7f..a07bc571f26 100644 --- a/Mage.Sets/src/mage/cards/d/Distress.java +++ b/Mage.Sets/src/mage/cards/d/Distress.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/d/DisturbedBurial.java b/Mage.Sets/src/mage/cards/d/DisturbedBurial.java index 3562d8622e8..cf9f9b3f865 100644 --- a/Mage.Sets/src/mage/cards/d/DisturbedBurial.java +++ b/Mage.Sets/src/mage/cards/d/DisturbedBurial.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; +import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; -import mage.abilities.effects.common.ReturnToHandTargetEffect; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DisturbingPlot.java b/Mage.Sets/src/mage/cards/d/DisturbingPlot.java index 6ca51903036..32b48322662 100644 --- a/Mage.Sets/src/mage/cards/d/DisturbingPlot.java +++ b/Mage.Sets/src/mage/cards/d/DisturbingPlot.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.ConspireAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DiveBomber.java b/Mage.Sets/src/mage/cards/d/DiveBomber.java index 60f364d6d77..b742145039f 100644 --- a/Mage.Sets/src/mage/cards/d/DiveBomber.java +++ b/Mage.Sets/src/mage/cards/d/DiveBomber.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DivebomberGriffin.java b/Mage.Sets/src/mage/cards/d/DivebomberGriffin.java index a1a0c3cc4e0..6abcfdd2e92 100644 --- a/Mage.Sets/src/mage/cards/d/DivebomberGriffin.java +++ b/Mage.Sets/src/mage/cards/d/DivebomberGriffin.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,10 +36,13 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DivergentGrowth.java b/Mage.Sets/src/mage/cards/d/DivergentGrowth.java index 986041f9664..e69768be977 100644 --- a/Mage.Sets/src/mage/cards/d/DivergentGrowth.java +++ b/Mage.Sets/src/mage/cards/d/DivergentGrowth.java @@ -27,8 +27,7 @@ */ package mage.cards.d; -import java.util.UUID; - +import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.abilities.mana.AnyColorManaAbility; @@ -37,7 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledLandPermanent; -import mage.abilities.effects.Effect; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DivergentTransformations.java b/Mage.Sets/src/mage/cards/d/DivergentTransformations.java index 81044f05e96..8f47cc06fca 100644 --- a/Mage.Sets/src/mage/cards/d/DivergentTransformations.java +++ b/Mage.Sets/src/mage/cards/d/DivergentTransformations.java @@ -27,20 +27,11 @@ */ package mage.cards.d; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.UndauntedAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -50,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.*; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java b/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java index 8bcd5439223..8cc5b3ad41d 100644 --- a/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java +++ b/Mage.Sets/src/mage/cards/d/DiversionaryTactics.java @@ -27,15 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -43,6 +41,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/Divert.java b/Mage.Sets/src/mage/cards/d/Divert.java index cc5636faa6b..41d2e131924 100644 --- a/Mage.Sets/src/mage/cards/d/Divert.java +++ b/Mage.Sets/src/mage/cards/d/Divert.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; @@ -41,6 +40,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author cbt33, Rafbill (Frightful Delustions) diff --git a/Mage.Sets/src/mage/cards/d/Divination.java b/Mage.Sets/src/mage/cards/d/Divination.java index 0d7f47b4d99..efce95ca25a 100644 --- a/Mage.Sets/src/mage/cards/d/Divination.java +++ b/Mage.Sets/src/mage/cards/d/Divination.java @@ -28,11 +28,12 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DivineDeflection.java b/Mage.Sets/src/mage/cards/d/DivineDeflection.java index ea4a405c779..e75425cd9e2 100644 --- a/Mage.Sets/src/mage/cards/d/DivineDeflection.java +++ b/Mage.Sets/src/mage/cards/d/DivineDeflection.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectData; import mage.abilities.effects.PreventionEffectImpl; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/d/DivineFavor.java b/Mage.Sets/src/mage/cards/d/DivineFavor.java index 9e8da3a792a..6b36d90b191 100644 --- a/Mage.Sets/src/mage/cards/d/DivineFavor.java +++ b/Mage.Sets/src/mage/cards/d/DivineFavor.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,9 +37,15 @@ 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/DivineIntervention.java b/Mage.Sets/src/mage/cards/d/DivineIntervention.java index 9b1be523e13..bbf0ec995c9 100644 --- a/Mage.Sets/src/mage/cards/d/DivineIntervention.java +++ b/Mage.Sets/src/mage/cards/d/DivineIntervention.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -51,6 +49,9 @@ import mage.game.permanent.Permanent; import mage.game.stack.StackObject; import mage.players.Player; +import java.util.Objects; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/d/DivineLight.java b/Mage.Sets/src/mage/cards/d/DivineLight.java index 3035f362f88..9c3d4bd9979 100644 --- a/Mage.Sets/src/mage/cards/d/DivineLight.java +++ b/Mage.Sets/src/mage/cards/d/DivineLight.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.PreventAllDamageToAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DivineOffering.java b/Mage.Sets/src/mage/cards/d/DivineOffering.java index 9e33324dc4c..bbb52b22f67 100644 --- a/Mage.Sets/src/mage/cards/d/DivineOffering.java +++ b/Mage.Sets/src/mage/cards/d/DivineOffering.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author ayratn diff --git a/Mage.Sets/src/mage/cards/d/DivinePresence.java b/Mage.Sets/src/mage/cards/d/DivinePresence.java index 5a7ab55499c..f61c64931e5 100644 --- a/Mage.Sets/src/mage/cards/d/DivinePresence.java +++ b/Mage.Sets/src/mage/cards/d/DivinePresence.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DivineReckoning.java b/Mage.Sets/src/mage/cards/d/DivineReckoning.java index 23930107329..d33119caa27 100644 --- a/Mage.Sets/src/mage/cards/d/DivineReckoning.java +++ b/Mage.Sets/src/mage/cards/d/DivineReckoning.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -48,6 +45,10 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/d/DivineSacrament.java b/Mage.Sets/src/mage/cards/d/DivineSacrament.java index 636b723ca36..42d627aa942 100644 --- a/Mage.Sets/src/mage/cards/d/DivineSacrament.java +++ b/Mage.Sets/src/mage/cards/d/DivineSacrament.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Beta_Steward (Honor of the Pure), LevelX2 (Demoralize), cbt diff --git a/Mage.Sets/src/mage/cards/d/DivineTransformation.java b/Mage.Sets/src/mage/cards/d/DivineTransformation.java index 7b149824bd8..3365e15786c 100644 --- a/Mage.Sets/src/mage/cards/d/DivineTransformation.java +++ b/Mage.Sets/src/mage/cards/d/DivineTransformation.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DivineVerdict.java b/Mage.Sets/src/mage/cards/d/DivineVerdict.java index 7d7303d404c..9cc85aa00bb 100644 --- a/Mage.Sets/src/mage/cards/d/DivineVerdict.java +++ b/Mage.Sets/src/mage/cards/d/DivineVerdict.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DivinerSpirit.java b/Mage.Sets/src/mage/cards/d/DivinerSpirit.java index f963f3f371a..0d47a134927 100644 --- a/Mage.Sets/src/mage/cards/d/DivinerSpirit.java +++ b/Mage.Sets/src/mage/cards/d/DivinerSpirit.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DivinersWand.java b/Mage.Sets/src/mage/cards/d/DivinersWand.java index 49d0fc75b88..847a8355a92 100644 --- a/Mage.Sets/src/mage/cards/d/DivinersWand.java +++ b/Mage.Sets/src/mage/cards/d/DivinersWand.java @@ -27,12 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DrawCardControllerTriggeredAbility; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -49,11 +43,13 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.SetTargetPointer; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DivingGriffin.java b/Mage.Sets/src/mage/cards/d/DivingGriffin.java index 0561d3292c4..721b1709d29 100644 --- a/Mage.Sets/src/mage/cards/d/DivingGriffin.java +++ b/Mage.Sets/src/mage/cards/d/DivingGriffin.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DiviningWitch.java b/Mage.Sets/src/mage/cards/d/DiviningWitch.java index 47295968c63..f92247e076b 100644 --- a/Mage.Sets/src/mage/cards/d/DiviningWitch.java +++ b/Mage.Sets/src/mage/cards/d/DiviningWitch.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author maxlebedev diff --git a/Mage.Sets/src/mage/cards/d/DivinityOfPride.java b/Mage.Sets/src/mage/cards/d/DivinityOfPride.java index 8e4af190847..993080bdc0c 100644 --- a/Mage.Sets/src/mage/cards/d/DivinityOfPride.java +++ b/Mage.Sets/src/mage/cards/d/DivinityOfPride.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DizzySpell.java b/Mage.Sets/src/mage/cards/d/DizzySpell.java index 79f8dffe3e0..f2a0032eb24 100644 --- a/Mage.Sets/src/mage/cards/d/DizzySpell.java +++ b/Mage.Sets/src/mage/cards/d/DizzySpell.java @@ -27,16 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DjinnOfInfiniteDeceits.java b/Mage.Sets/src/mage/cards/d/DjinnOfInfiniteDeceits.java index 1dbaac8f2de..a934d84537e 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnOfInfiniteDeceits.java +++ b/Mage.Sets/src/mage/cards/d/DjinnOfInfiniteDeceits.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DjinnOfTheLamp.java b/Mage.Sets/src/mage/cards/d/DjinnOfTheLamp.java index 6a83b4c25eb..5e43b29172f 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnOfTheLamp.java +++ b/Mage.Sets/src/mage/cards/d/DjinnOfTheLamp.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java b/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java index 0a65c1f3fa3..ac165400651 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java +++ b/Mage.Sets/src/mage/cards/d/DjinnOfWishes.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -38,11 +37,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -50,6 +45,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/d/DoOrDie.java b/Mage.Sets/src/mage/cards/d/DoOrDie.java index c46aad28063..933c4051d3c 100644 --- a/Mage.Sets/src/mage/cards/d/DoOrDie.java +++ b/Mage.Sets/src/mage/cards/d/DoOrDie.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -43,6 +40,10 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java index 37e4f74dabb..db82b19019b 100644 --- a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java +++ b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -37,9 +36,9 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransformAbility; -import mage.cards.f.FinalIteration; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.f.FinalIteration; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -53,6 +52,8 @@ import mage.game.Game; import mage.game.permanent.token.HumanWizardToken; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Dodecapod.java b/Mage.Sets/src/mage/cards/d/Dodecapod.java index faa4adacfb8..91ebb4ca3cb 100644 --- a/Mage.Sets/src/mage/cards/d/Dodecapod.java +++ b/Mage.Sets/src/mage/cards/d/Dodecapod.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DoggedHunter.java b/Mage.Sets/src/mage/cards/d/DoggedHunter.java index 2485713a163..1f2b00d51b6 100644 --- a/Mage.Sets/src/mage/cards/d/DoggedHunter.java +++ b/Mage.Sets/src/mage/cards/d/DoggedHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author noxx (Harvester of Souls), cbt33 diff --git a/Mage.Sets/src/mage/cards/d/DolmenGate.java b/Mage.Sets/src/mage/cards/d/DolmenGate.java index 28dd613506c..a0c7dfac669 100644 --- a/Mage.Sets/src/mage/cards/d/DolmenGate.java +++ b/Mage.Sets/src/mage/cards/d/DolmenGate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.PreventAllDamageToAllEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreatureInPlay; import mage.filter.predicate.permanent.AttackingPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java b/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java index 20f3d4e1b66..4212d403ab6 100644 --- a/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java +++ b/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Domestication.java b/Mage.Sets/src/mage/cards/d/Domestication.java index e80f0c41f64..eac4ad4fa3c 100644 --- a/Mage.Sets/src/mage/cards/d/Domestication.java +++ b/Mage.Sets/src/mage/cards/d/Domestication.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; @@ -42,6 +39,7 @@ import mage.abilities.effects.common.continuous.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; @@ -49,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/Dominate.java b/Mage.Sets/src/mage/cards/d/Dominate.java index ef0d30d7000..fc5f42851b0 100644 --- a/Mage.Sets/src/mage/cards/d/Dominate.java +++ b/Mage.Sets/src/mage/cards/d/Dominate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.common.continuous.GainControlTargetEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DominatingLicid.java b/Mage.Sets/src/mage/cards/d/DominatingLicid.java index 09165e8ccce..7ab0a25e096 100644 --- a/Mage.Sets/src/mage/cards/d/DominatingLicid.java +++ b/Mage.Sets/src/mage/cards/d/DominatingLicid.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LicidAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DominatorDrone.java b/Mage.Sets/src/mage/cards/d/DominatorDrone.java index cc3e5ad527d..0625dbe73c6 100644 --- a/Mage.Sets/src/mage/cards/d/DominatorDrone.java +++ b/Mage.Sets/src/mage/cards/d/DominatorDrone.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.TriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Domineer.java b/Mage.Sets/src/mage/cards/d/Domineer.java index 1829064afd1..730669c51d2 100644 --- a/Mage.Sets/src/mage/cards/d/Domineer.java +++ b/Mage.Sets/src/mage/cards/d/Domineer.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DomineeringWill.java b/Mage.Sets/src/mage/cards/d/DomineeringWill.java index ee861946140..397ceeaa1f4 100644 --- a/Mage.Sets/src/mage/cards/d/DomineeringWill.java +++ b/Mage.Sets/src/mage/cards/d/DomineeringWill.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; @@ -50,6 +49,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DominusOfFealty.java b/Mage.Sets/src/mage/cards/d/DominusOfFealty.java index c3bae10dd4d..95203f0ae0d 100644 --- a/Mage.Sets/src/mage/cards/d/DominusOfFealty.java +++ b/Mage.Sets/src/mage/cards/d/DominusOfFealty.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,10 +37,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DomriRade.java b/Mage.Sets/src/mage/cards/d/DomriRade.java index 16f5947be5a..9f2be0dc973 100644 --- a/Mage.Sets/src/mage/cards/d/DomriRade.java +++ b/Mage.Sets/src/mage/cards/d/DomriRade.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -59,6 +58,8 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Donate.java b/Mage.Sets/src/mage/cards/d/Donate.java index de1284c6656..9e89b3d3d24 100644 --- a/Mage.Sets/src/mage/cards/d/Donate.java +++ b/Mage.Sets/src/mage/cards/d/Donate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java b/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java index beb4ff5e875..1c154b1072a 100644 --- a/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java +++ b/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -44,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -58,7 +60,7 @@ public class DongZhouTheTyrant extends CardImpl { public DongZhouTheTyrant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/d/DoomBlade.java b/Mage.Sets/src/mage/cards/d/DoomBlade.java index 3eb675c7a68..05ffce1a3da 100644 --- a/Mage.Sets/src/mage/cards/d/DoomBlade.java +++ b/Mage.Sets/src/mage/cards/d/DoomBlade.java @@ -28,17 +28,18 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LokiX diff --git a/Mage.Sets/src/mage/cards/d/DoomedNecromancer.java b/Mage.Sets/src/mage/cards/d/DoomedNecromancer.java index 50ef4076c97..e283c1f599a 100644 --- a/Mage.Sets/src/mage/cards/d/DoomedNecromancer.java +++ b/Mage.Sets/src/mage/cards/d/DoomedNecromancer.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,11 +36,14 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DoomedTraveler.java b/Mage.Sets/src/mage/cards/d/DoomedTraveler.java index ad5b971ff02..6daf5dd201d 100644 --- a/Mage.Sets/src/mage/cards/d/DoomedTraveler.java +++ b/Mage.Sets/src/mage/cards/d/DoomedTraveler.java @@ -27,15 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/d/Doomgape.java b/Mage.Sets/src/mage/cards/d/Doomgape.java index 6235d240937..a4fd6bc9426 100644 --- a/Mage.Sets/src/mage/cards/d/Doomgape.java +++ b/Mage.Sets/src/mage/cards/d/Doomgape.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/Doomsday.java b/Mage.Sets/src/mage/cards/d/Doomsday.java index 05971ffb80b..68b079224cd 100644 --- a/Mage.Sets/src/mage/cards/d/Doomsday.java +++ b/Mage.Sets/src/mage/cards/d/Doomsday.java @@ -27,15 +27,10 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LoseHalfLifeEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -44,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DoomsdaySpecter.java b/Mage.Sets/src/mage/cards/d/DoomsdaySpecter.java index c917080fc07..af090044a5b 100644 --- a/Mage.Sets/src/mage/cards/d/DoomsdaySpecter.java +++ b/Mage.Sets/src/mage/cards/d/DoomsdaySpecter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DoomwakeGiant.java b/Mage.Sets/src/mage/cards/d/DoomwakeGiant.java index d5d6ee4f0be..e09a261b445 100644 --- a/Mage.Sets/src/mage/cards/d/DoomwakeGiant.java +++ b/Mage.Sets/src/mage/cards/d/DoomwakeGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.ConstellationAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -39,6 +38,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java b/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java index 982ab90894d..f2908393a7a 100644 --- a/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java +++ b/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -37,13 +36,7 @@ import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -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.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; @@ -55,6 +48,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DoorToNothingness.java b/Mage.Sets/src/mage/cards/d/DoorToNothingness.java index dcd77a9dd71..c227e7ce1ea 100644 --- a/Mage.Sets/src/mage/cards/d/DoorToNothingness.java +++ b/Mage.Sets/src/mage/cards/d/DoorToNothingness.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +36,15 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/Doorkeeper.java b/Mage.Sets/src/mage/cards/d/Doorkeeper.java index 769d3b8f46e..21d14ce6937 100644 --- a/Mage.Sets/src/mage/cards/d/Doorkeeper.java +++ b/Mage.Sets/src/mage/cards/d/Doorkeeper.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +37,14 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DoranTheSiegeTower.java b/Mage.Sets/src/mage/cards/d/DoranTheSiegeTower.java index 99462b01b38..cde7ba5a338 100644 --- a/Mage.Sets/src/mage/cards/d/DoranTheSiegeTower.java +++ b/Mage.Sets/src/mage/cards/d/DoranTheSiegeTower.java @@ -27,23 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.SubLayer; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; +import java.util.UUID; + /** * * 613.10. Some continuous effects affect game rules rather than objects. For example, @@ -61,7 +56,7 @@ public class DoranTheSiegeTower extends CardImpl { public DoranTheSiegeTower(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Treefolk"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/d/DormantGomazoa.java b/Mage.Sets/src/mage/cards/d/DormantGomazoa.java index 0dd535bced7..b3537fe1627 100644 --- a/Mage.Sets/src/mage/cards/d/DormantGomazoa.java +++ b/Mage.Sets/src/mage/cards/d/DormantGomazoa.java @@ -27,18 +27,19 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.Zone; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; +import mage.abilities.common.BecomesTargetControllerSpellTriggeredAbility; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; -import mage.abilities.common.BecomesTargetControllerSpellTriggeredAbility; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DormantSliver.java b/Mage.Sets/src/mage/cards/d/DormantSliver.java index 07cf80a9039..0b405c3cbb1 100644 --- a/Mage.Sets/src/mage/cards/d/DormantSliver.java +++ b/Mage.Sets/src/mage/cards/d/DormantSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/d/DormantVolcano.java b/Mage.Sets/src/mage/cards/d/DormantVolcano.java index 600514bacac..996bb0181a9 100644 --- a/Mage.Sets/src/mage/cards/d/DormantVolcano.java +++ b/Mage.Sets/src/mage/cards/d/DormantVolcano.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java b/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java index ce0651a441b..4dd097dbedc 100644 --- a/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java +++ b/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java @@ -27,20 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +47,7 @@ public class DosanTheFallingLeaf extends CardImpl { public DosanTheFallingLeaf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Monk"); diff --git a/Mage.Sets/src/mage/cards/d/DosansOldestChant.java b/Mage.Sets/src/mage/cards/d/DosansOldestChant.java index 364387a9b39..9c1e492ade9 100644 --- a/Mage.Sets/src/mage/cards/d/DosansOldestChant.java +++ b/Mage.Sets/src/mage/cards/d/DosansOldestChant.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DoubleCleave.java b/Mage.Sets/src/mage/cards/d/DoubleCleave.java index 86f480b6516..d2fc6395d55 100644 --- a/Mage.Sets/src/mage/cards/d/DoubleCleave.java +++ b/Mage.Sets/src/mage/cards/d/DoubleCleave.java @@ -27,16 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DoubleNegative.java b/Mage.Sets/src/mage/cards/d/DoubleNegative.java index e8844e91f75..d31cc9aaa8b 100644 --- a/Mage.Sets/src/mage/cards/d/DoubleNegative.java +++ b/Mage.Sets/src/mage/cards/d/DoubleNegative.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterSpell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DoublingCube.java b/Mage.Sets/src/mage/cards/d/DoublingCube.java index f43260df503..5a346038c9c 100644 --- a/Mage.Sets/src/mage/cards/d/DoublingCube.java +++ b/Mage.Sets/src/mage/cards/d/DoublingCube.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.players.ManaPool; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DoublingSeason.java b/Mage.Sets/src/mage/cards/d/DoublingSeason.java index 72a86fd92cc..78ace98682b 100644 --- a/Mage.Sets/src/mage/cards/d/DoublingSeason.java +++ b/Mage.Sets/src/mage/cards/d/DoublingSeason.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DoubtlessOne.java b/Mage.Sets/src/mage/cards/d/DoubtlessOne.java index 2dd399f240d..1a87170deba 100644 --- a/Mage.Sets/src/mage/cards/d/DoubtlessOne.java +++ b/Mage.Sets/src/mage/cards/d/DoubtlessOne.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageGainLifeSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/Douse.java b/Mage.Sets/src/mage/cards/d/Douse.java index 5482ecd398e..8d204baf413 100644 --- a/Mage.Sets/src/mage/cards/d/Douse.java +++ b/Mage.Sets/src/mage/cards/d/Douse.java @@ -27,19 +27,20 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/d/DouseInGloom.java b/Mage.Sets/src/mage/cards/d/DouseInGloom.java index 9b30942040d..d61bc564525 100644 --- a/Mage.Sets/src/mage/cards/d/DouseInGloom.java +++ b/Mage.Sets/src/mage/cards/d/DouseInGloom.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Dovescape.java b/Mage.Sets/src/mage/cards/d/Dovescape.java index 1ca4b64ed80..92e76a622fe 100644 --- a/Mage.Sets/src/mage/cards/d/Dovescape.java +++ b/Mage.Sets/src/mage/cards/d/Dovescape.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastAllTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.permanent.token.Token; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DovinBaan.java b/Mage.Sets/src/mage/cards/d/DovinBaan.java index 6979c1b5385..24be763b9aa 100644 --- a/Mage.Sets/src/mage/cards/d/DovinBaan.java +++ b/Mage.Sets/src/mage/cards/d/DovinBaan.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -53,6 +52,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DownDirty.java b/Mage.Sets/src/mage/cards/d/DownDirty.java index 85557a36f2d..1aedbb3d31f 100644 --- a/Mage.Sets/src/mage/cards/d/DownDirty.java +++ b/Mage.Sets/src/mage/cards/d/DownDirty.java @@ -28,15 +28,16 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardSetInfo; import mage.cards.SplitCard; +import mage.constants.CardType; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Downdraft.java b/Mage.Sets/src/mage/cards/d/Downdraft.java index 3f0a27abfb5..18be536f403 100644 --- a/Mage.Sets/src/mage/cards/d/Downdraft.java +++ b/Mage.Sets/src/mage/cards/d/Downdraft.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DownhillCharge.java b/Mage.Sets/src/mage/cards/d/DownhillCharge.java index c12a0470512..b015c3b8b0c 100644 --- a/Mage.Sets/src/mage/cards/d/DownhillCharge.java +++ b/Mage.Sets/src/mage/cards/d/DownhillCharge.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/Downpour.java b/Mage.Sets/src/mage/cards/d/Downpour.java index 170b3d79f87..32943b81268 100644 --- a/Mage.Sets/src/mage/cards/d/Downpour.java +++ b/Mage.Sets/src/mage/cards/d/Downpour.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/Downsize.java b/Mage.Sets/src/mage/cards/d/Downsize.java index 75e46855cc8..73924e99ee7 100644 --- a/Mage.Sets/src/mage/cards/d/Downsize.java +++ b/Mage.Sets/src/mage/cards/d/Downsize.java @@ -27,21 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DowsingShaman.java b/Mage.Sets/src/mage/cards/d/DowsingShaman.java index 6207aed9c8a..4654d94a835 100644 --- a/Mage.Sets/src/mage/cards/d/DowsingShaman.java +++ b/Mage.Sets/src/mage/cards/d/DowsingShaman.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +35,14 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Draco.java b/Mage.Sets/src/mage/cards/d/Draco.java index d004576ac65..aa48c5727f7 100644 --- a/Mage.Sets/src/mage/cards/d/Draco.java +++ b/Mage.Sets/src/mage/cards/d/Draco.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Simown diff --git a/Mage.Sets/src/mage/cards/d/DraconianCylix.java b/Mage.Sets/src/mage/cards/d/DraconianCylix.java index 071f47e65e6..ab1daf7d29e 100644 --- a/Mage.Sets/src/mage/cards/d/DraconianCylix.java +++ b/Mage.Sets/src/mage/cards/d/DraconianCylix.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DraconicRoar.java b/Mage.Sets/src/mage/cards/d/DraconicRoar.java index 1ce30c3c266..57135017bb9 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicRoar.java +++ b/Mage.Sets/src/mage/cards/d/DraconicRoar.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.OneShotEffect; @@ -48,6 +46,8 @@ import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanent; import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dracoplasm.java b/Mage.Sets/src/mage/cards/d/Dracoplasm.java index 8609d41e87e..9bc7f4baf76 100644 --- a/Mage.Sets/src/mage/cards/d/Dracoplasm.java +++ b/Mage.Sets/src/mage/cards/d/Dracoplasm.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,12 +39,7 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -56,6 +50,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DrafnasRestoration.java b/Mage.Sets/src/mage/cards/d/DrafnasRestoration.java index 29928428166..a6f5d71904c 100644 --- a/Mage.Sets/src/mage/cards/d/DrafnasRestoration.java +++ b/Mage.Sets/src/mage/cards/d/DrafnasRestoration.java @@ -27,17 +27,10 @@ */ package mage.cards.d; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterArtifactCard; @@ -48,6 +41,10 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCardInGraveyard; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DragDown.java b/Mage.Sets/src/mage/cards/d/DragDown.java index daaa26256b1..557c5c34649 100644 --- a/Mage.Sets/src/mage/cards/d/DragDown.java +++ b/Mage.Sets/src/mage/cards/d/DragDown.java @@ -27,15 +27,16 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DragUnder.java b/Mage.Sets/src/mage/cards/d/DragUnder.java index 3fc832bad3e..596443dae0f 100644 --- a/Mage.Sets/src/mage/cards/d/DragUnder.java +++ b/Mage.Sets/src/mage/cards/d/DragUnder.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonAppeasement.java b/Mage.Sets/src/mage/cards/d/DragonAppeasement.java index 4af38e92122..c5c4b638106 100644 --- a/Mage.Sets/src/mage/cards/d/DragonAppeasement.java +++ b/Mage.Sets/src/mage/cards/d/DragonAppeasement.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DragonArch.java b/Mage.Sets/src/mage/cards/d/DragonArch.java index 66441fa4abe..0a7b8999cfe 100644 --- a/Mage.Sets/src/mage/cards/d/DragonArch.java +++ b/Mage.Sets/src/mage/cards/d/DragonArch.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.MulticoloredPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DragonBellMonk.java b/Mage.Sets/src/mage/cards/d/DragonBellMonk.java index e947c738bb6..61668299c95 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBellMonk.java +++ b/Mage.Sets/src/mage/cards/d/DragonBellMonk.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.ProwessAbility; +import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DragonBlood.java b/Mage.Sets/src/mage/cards/d/DragonBlood.java index 16f8c315a35..3b0111fdf80 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBlood.java +++ b/Mage.Sets/src/mage/cards/d/DragonBlood.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,10 +34,13 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DragonBreath.java b/Mage.Sets/src/mage/cards/d/DragonBreath.java index 53c6014f87a..c49b47e4590 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBreath.java +++ b/Mage.Sets/src/mage/cards/d/DragonBreath.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,13 +41,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -58,6 +51,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DragonBroodmother.java b/Mage.Sets/src/mage/cards/d/DragonBroodmother.java index f1977ced4c7..de311fd6100 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBroodmother.java +++ b/Mage.Sets/src/mage/cards/d/DragonBroodmother.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonEgg.java b/Mage.Sets/src/mage/cards/d/DragonEgg.java index c73a9b9246e..d7f4cdfeedb 100644 --- a/Mage.Sets/src/mage/cards/d/DragonEgg.java +++ b/Mage.Sets/src/mage/cards/d/DragonEgg.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DragonEngine.java b/Mage.Sets/src/mage/cards/d/DragonEngine.java index 233dd71036f..25c73969488 100644 --- a/Mage.Sets/src/mage/cards/d/DragonEngine.java +++ b/Mage.Sets/src/mage/cards/d/DragonEngine.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DragonFangs.java b/Mage.Sets/src/mage/cards/d/DragonFangs.java index e12fcc75503..d28f9991cbe 100644 --- a/Mage.Sets/src/mage/cards/d/DragonFangs.java +++ b/Mage.Sets/src/mage/cards/d/DragonFangs.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,12 +39,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -55,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DragonFodder.java b/Mage.Sets/src/mage/cards/d/DragonFodder.java index 04f743bc7f1..58f49e488b6 100644 --- a/Mage.Sets/src/mage/cards/d/DragonFodder.java +++ b/Mage.Sets/src/mage/cards/d/DragonFodder.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.GoblinToken; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DragonGrip.java b/Mage.Sets/src/mage/cards/d/DragonGrip.java index 320f1cf7019..47342ce2c45 100644 --- a/Mage.Sets/src/mage/cards/d/DragonGrip.java +++ b/Mage.Sets/src/mage/cards/d/DragonGrip.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FerociousCondition; @@ -42,14 +41,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonHatchling.java b/Mage.Sets/src/mage/cards/d/DragonHatchling.java index e34cec227a9..7b93d6ca622 100644 --- a/Mage.Sets/src/mage/cards/d/DragonHatchling.java +++ b/Mage.Sets/src/mage/cards/d/DragonHatchling.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +34,11 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DragonHunter.java b/Mage.Sets/src/mage/cards/d/DragonHunter.java index d932b0237c0..195d243a32a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonHunter.java +++ b/Mage.Sets/src/mage/cards/d/DragonHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,14 +34,12 @@ import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.game.Game; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonMage.java b/Mage.Sets/src/mage/cards/d/DragonMage.java index df56bb3588b..0ed01d6fa2f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMage.java +++ b/Mage.Sets/src/mage/cards/d/DragonMage.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DragonMantle.java b/Mage.Sets/src/mage/cards/d/DragonMantle.java index 911627e9ac2..d18ac8d6a6f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMantle.java +++ b/Mage.Sets/src/mage/cards/d/DragonMantle.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,14 +39,12 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DragonMask.java b/Mage.Sets/src/mage/cards/d/DragonMask.java index 7bf95f9b845..3f9d3e3b97c 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMask.java +++ b/Mage.Sets/src/mage/cards/d/DragonMask.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DragonRoost.java b/Mage.Sets/src/mage/cards/d/DragonRoost.java index 107a4fabf88..caa20eb1379 100644 --- a/Mage.Sets/src/mage/cards/d/DragonRoost.java +++ b/Mage.Sets/src/mage/cards/d/DragonRoost.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.DragonToken2; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DragonScales.java b/Mage.Sets/src/mage/cards/d/DragonScales.java index 63cf3794c1b..cd9bef831d9 100644 --- a/Mage.Sets/src/mage/cards/d/DragonScales.java +++ b/Mage.Sets/src/mage/cards/d/DragonScales.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,12 +39,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -55,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DragonScarredBear.java b/Mage.Sets/src/mage/cards/d/DragonScarredBear.java index 5323b6518e0..a446cd654da 100644 --- a/Mage.Sets/src/mage/cards/d/DragonScarredBear.java +++ b/Mage.Sets/src/mage/cards/d/DragonScarredBear.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonShadow.java b/Mage.Sets/src/mage/cards/d/DragonShadow.java index 180d0b81361..f6b3d127c7c 100644 --- a/Mage.Sets/src/mage/cards/d/DragonShadow.java +++ b/Mage.Sets/src/mage/cards/d/DragonShadow.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,12 +39,7 @@ import mage.abilities.keyword.FearAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -55,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DragonStyleTwins.java b/Mage.Sets/src/mage/cards/d/DragonStyleTwins.java index a581bec601a..8cd38169aea 100644 --- a/Mage.Sets/src/mage/cards/d/DragonStyleTwins.java +++ b/Mage.Sets/src/mage/cards/d/DragonStyleTwins.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.ProwessAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonTempest.java b/Mage.Sets/src/mage/cards/d/DragonTempest.java index fb585ca392c..06264220b72 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTempest.java +++ b/Mage.Sets/src/mage/cards/d/DragonTempest.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,11 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -51,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java b/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java index d00efe30898..c1a007eacba 100644 --- a/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java +++ b/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,13 +43,11 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +56,7 @@ public class DragonThroneOfTarkir extends CardImpl { public DragonThroneOfTarkir(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature has defender and "{2}, {T}: Other creatures you control gain trample and get +X/+X until end of turn, where X is this creature's power." diff --git a/Mage.Sets/src/mage/cards/d/DragonTyrant.java b/Mage.Sets/src/mage/cards/d/DragonTyrant.java index a398e1c4952..64f38768d3e 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTyrant.java +++ b/Mage.Sets/src/mage/cards/d/DragonTyrant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DragonWhelp.java b/Mage.Sets/src/mage/cards/d/DragonWhelp.java index 8951f353b5f..12670f14b2a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhelp.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhelp.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivationInfo; @@ -47,6 +46,8 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java index 8683df206ea..d78722a4170 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -46,6 +45,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.DragonToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DragonWings.java b/Mage.Sets/src/mage/cards/d/DragonWings.java index 5a83ea34613..36fba202f61 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWings.java +++ b/Mage.Sets/src/mage/cards/d/DragonWings.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,11 +40,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -55,6 +50,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DragonlairSpider.java b/Mage.Sets/src/mage/cards/d/DragonlairSpider.java index dd917237657..158341deb83 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlairSpider.java +++ b/Mage.Sets/src/mage/cards/d/DragonlairSpider.java @@ -27,16 +27,17 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.InsectToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java index 0c4f4f37bdf..003ae075b61 100644 --- a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java +++ b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonlordAtarka.java b/Mage.Sets/src/mage/cards/d/DragonlordAtarka.java index 14238939da4..91ec577d28f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordAtarka.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordAtarka.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,11 +36,14 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreatureOrPlaneswalkerAmount; +import java.util.UUID; + /** * * @author fireshoes @@ -56,7 +58,7 @@ public class DragonlordAtarka extends CardImpl { public DragonlordAtarka(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/d/DragonlordDromoka.java b/Mage.Sets/src/mage/cards/d/DragonlordDromoka.java index bbd48042228..8ea4586564b 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordDromoka.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordDromoka.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredAbility; @@ -37,13 +36,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +50,7 @@ public class DragonlordDromoka extends CardImpl { public DragonlordDromoka(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java b/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java index 41610767341..595cb73a7be 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -49,6 +49,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +59,7 @@ public class DragonlordKolaghan extends CardImpl { public DragonlordKolaghan(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java b/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java index 50571ff4330..09865581049 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,9 +42,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; +import java.util.UUID; + /** * * @author fireshoes @@ -54,7 +56,7 @@ public class DragonlordOjutai extends CardImpl { public DragonlordOjutai(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/d/DragonlordSilumgar.java b/Mage.Sets/src/mage/cards/d/DragonlordSilumgar.java index 65fb2f0c655..fa42332d200 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordSilumgar.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordSilumgar.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -51,6 +51,8 @@ import mage.target.common.TargetCreatureOrPlaneswalker; import mage.util.CardUtil; import mage.util.GameLog; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -59,7 +61,7 @@ public class DragonlordSilumgar extends CardImpl { public DragonlordSilumgar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java b/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java index eddbb7ff9a8..0bfc8768dbe 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; @@ -50,6 +49,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DragonlordsServant.java b/Mage.Sets/src/mage/cards/d/DragonlordsServant.java index 4c1cb335d59..68ea8329618 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordsServant.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordsServant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java b/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java index b3fd955144d..9df9da81776 100644 --- a/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java +++ b/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java @@ -27,11 +27,8 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.abilities.CountType; -import mage.constants.CardType; import mage.MageInt; +import mage.abilities.CountType; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -39,11 +36,14 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.DragonToken2; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/Dragonrage.java b/Mage.Sets/src/mage/cards/d/Dragonrage.java index 0bafcd6e74f..c78d485bd8a 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonrage.java +++ b/Mage.Sets/src/mage/cards/d/Dragonrage.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonsClaw.java b/Mage.Sets/src/mage/cards/d/DragonsClaw.java index f259878511b..898c7653a3e 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsClaw.java +++ b/Mage.Sets/src/mage/cards/d/DragonsClaw.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java b/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java index bca366afcb7..5a76259f5e3 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java +++ b/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DragonsEyeSentry.java b/Mage.Sets/src/mage/cards/d/DragonsEyeSentry.java index 2f15fb94bc1..845c61da884 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsEyeSentry.java +++ b/Mage.Sets/src/mage/cards/d/DragonsEyeSentry.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FirstStrikeAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DragonsHerald.java b/Mage.Sets/src/mage/cards/d/DragonsHerald.java index 2964d12b3e8..6f4abbf5d89 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsHerald.java +++ b/Mage.Sets/src/mage/cards/d/DragonsHerald.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,6 +37,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DragonscaleBoon.java b/Mage.Sets/src/mage/cards/d/DragonscaleBoon.java index 06d352b110b..158d750338a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonscaleBoon.java +++ b/Mage.Sets/src/mage/cards/d/DragonscaleBoon.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java b/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java index a97c8ee8f32..de7434480fe 100644 --- a/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java +++ b/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dragonshift.java b/Mage.Sets/src/mage/cards/d/Dragonshift.java index df4dc6b6f1a..83dd1bbe18c 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonshift.java +++ b/Mage.Sets/src/mage/cards/d/Dragonshift.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; @@ -48,6 +47,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DragonskullSummit.java b/Mage.Sets/src/mage/cards/d/DragonskullSummit.java index 30220336050..e01a77c19b3 100644 --- a/Mage.Sets/src/mage/cards/d/DragonskullSummit.java +++ b/Mage.Sets/src/mage/cards/d/DragonskullSummit.java @@ -28,24 +28,24 @@ package mage.cards.d; -import java.util.UUID; - import mage.abilities.CountType; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.InvertCondition; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DragonsoulKnight.java b/Mage.Sets/src/mage/cards/d/DragonsoulKnight.java index 6d964183ea0..e4ba098dd9b 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsoulKnight.java +++ b/Mage.Sets/src/mage/cards/d/DragonsoulKnight.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,15 +40,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java b/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java index 9b78e3498c3..c52396b878a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java +++ b/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java @@ -27,17 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/Dragonstalker.java b/Mage.Sets/src/mage/cards/d/Dragonstalker.java index 810fe227264..4eabf83f1e8 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonstalker.java +++ b/Mage.Sets/src/mage/cards/d/Dragonstalker.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ProtectionAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dragonstorm.java b/Mage.Sets/src/mage/cards/d/Dragonstorm.java index 0231d94784e..ab637eeb29e 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonstorm.java +++ b/Mage.Sets/src/mage/cards/d/Dragonstorm.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DrainLife.java b/Mage.Sets/src/mage/cards/d/DrainLife.java index 3fda51e13b1..f3c0d0dd209 100644 --- a/Mage.Sets/src/mage/cards/d/DrainLife.java +++ b/Mage.Sets/src/mage/cards/d/DrainLife.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.VariableCost; import mage.abilities.costs.mana.VariableManaCost; @@ -43,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/d/DrainTheWell.java b/Mage.Sets/src/mage/cards/d/DrainTheWell.java index 44a1ac51499..5850840d971 100644 --- a/Mage.Sets/src/mage/cards/d/DrainTheWell.java +++ b/Mage.Sets/src/mage/cards/d/DrainTheWell.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DrainingWhelk.java b/Mage.Sets/src/mage/cards/d/DrainingWhelk.java index 31258222f2b..55955d89ee5 100644 --- a/Mage.Sets/src/mage/cards/d/DrainingWhelk.java +++ b/Mage.Sets/src/mage/cards/d/DrainingWhelk.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DrainpipeVermin.java b/Mage.Sets/src/mage/cards/d/DrainpipeVermin.java index 1cf4a3db661..fe3dfafd21f 100644 --- a/Mage.Sets/src/mage/cards/d/DrainpipeVermin.java +++ b/Mage.Sets/src/mage/cards/d/DrainpipeVermin.java @@ -27,19 +27,20 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.costs.mana.ColoredManaCost; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DoIfCostPaid; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DrakeFamiliar.java b/Mage.Sets/src/mage/cards/d/DrakeFamiliar.java index 91e28e49318..ad6cc553304 100644 --- a/Mage.Sets/src/mage/cards/d/DrakeFamiliar.java +++ b/Mage.Sets/src/mage/cards/d/DrakeFamiliar.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DrakeHatchling.java b/Mage.Sets/src/mage/cards/d/DrakeHatchling.java index 3fe4047f080..2749d3278f9 100644 --- a/Mage.Sets/src/mage/cards/d/DrakeHatchling.java +++ b/Mage.Sets/src/mage/cards/d/DrakeHatchling.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DrakeSkullCameo.java b/Mage.Sets/src/mage/cards/d/DrakeSkullCameo.java index 19dca75d1b2..45eb8d0d4a9 100644 --- a/Mage.Sets/src/mage/cards/d/DrakeSkullCameo.java +++ b/Mage.Sets/src/mage/cards/d/DrakeSkullCameo.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DrakeUmbra.java b/Mage.Sets/src/mage/cards/d/DrakeUmbra.java index 2b3c13013e9..7106c03baf9 100644 --- a/Mage.Sets/src/mage/cards/d/DrakeUmbra.java +++ b/Mage.Sets/src/mage/cards/d/DrakeUmbra.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -40,9 +37,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TotemArmorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DrakestownForgotten.java b/Mage.Sets/src/mage/cards/d/DrakestownForgotten.java index 7f146c1d574..f1fd80fc137 100644 --- a/Mage.Sets/src/mage/cards/d/DrakestownForgotten.java +++ b/Mage.Sets/src/mage/cards/d/DrakestownForgotten.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -46,6 +45,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DrakewingKrasis.java b/Mage.Sets/src/mage/cards/d/DrakewingKrasis.java index aea1a63d2e2..a57c0615029 100644 --- a/Mage.Sets/src/mage/cards/d/DrakewingKrasis.java +++ b/Mage.Sets/src/mage/cards/d/DrakewingKrasis.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DralnuLichLord.java b/Mage.Sets/src/mage/cards/d/DralnuLichLord.java index 0f30b7257d0..e874d85be3a 100644 --- a/Mage.Sets/src/mage/cards/d/DralnuLichLord.java +++ b/Mage.Sets/src/mage/cards/d/DralnuLichLord.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,13 +39,7 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.TimingRule; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -56,6 +49,8 @@ import mage.game.events.DamageCreatureEvent; import mage.game.events.GameEvent; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author emerald000 @@ -71,7 +66,7 @@ public class DralnuLichLord extends CardImpl { public DralnuLichLord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/d/DralnusCrusade.java b/Mage.Sets/src/mage/cards/d/DralnusCrusade.java index 87a90c7d674..6b43bc1b23a 100755 --- a/Mage.Sets/src/mage/cards/d/DralnusCrusade.java +++ b/Mage.Sets/src/mage/cards/d/DralnusCrusade.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,18 +34,13 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import static mage.constants.Layer.ColorChangingEffects_5; -import static mage.constants.Layer.TypeChangingEffects_4; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author brikr diff --git a/Mage.Sets/src/mage/cards/d/DralnusPet.java b/Mage.Sets/src/mage/cards/d/DralnusPet.java index f50bc567783..2c254c5bad8 100644 --- a/Mage.Sets/src/mage/cards/d/DralnusPet.java +++ b/Mage.Sets/src/mage/cards/d/DralnusPet.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -56,6 +55,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DramaticEntrance.java b/Mage.Sets/src/mage/cards/d/DramaticEntrance.java index 610c17b2bed..ce59ab13d67 100644 --- a/Mage.Sets/src/mage/cards/d/DramaticEntrance.java +++ b/Mage.Sets/src/mage/cards/d/DramaticEntrance.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DramaticRescue.java b/Mage.Sets/src/mage/cards/d/DramaticRescue.java index 0bd0c626a86..5eb35aa2ce7 100644 --- a/Mage.Sets/src/mage/cards/d/DramaticRescue.java +++ b/Mage.Sets/src/mage/cards/d/DramaticRescue.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DramaticReversal.java b/Mage.Sets/src/mage/cards/d/DramaticReversal.java index 8b91aff5362..85a81244420 100644 --- a/Mage.Sets/src/mage/cards/d/DramaticReversal.java +++ b/Mage.Sets/src/mage/cards/d/DramaticReversal.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java b/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java index bb9f54b4532..3a40814f8d2 100644 --- a/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java +++ b/Mage.Sets/src/mage/cards/d/DranaKalastriaBloodchief.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,10 +39,14 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -54,7 +55,7 @@ public class DranaKalastriaBloodchief extends CardImpl { public DranaKalastriaBloodchief(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/d/DranaLiberatorOfMalakir.java b/Mage.Sets/src/mage/cards/d/DranaLiberatorOfMalakir.java index d673a23491a..3179edc6cf3 100644 --- a/Mage.Sets/src/mage/cards/d/DranaLiberatorOfMalakir.java +++ b/Mage.Sets/src/mage/cards/d/DranaLiberatorOfMalakir.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; @@ -36,11 +35,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -55,7 +57,7 @@ public class DranaLiberatorOfMalakir extends CardImpl { public DranaLiberatorOfMalakir(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Ally"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/d/DranasChosen.java b/Mage.Sets/src/mage/cards/d/DranasChosen.java index 48b480f2d14..3d75436ad7c 100644 --- a/Mage.Sets/src/mage/cards/d/DranasChosen.java +++ b/Mage.Sets/src/mage/cards/d/DranasChosen.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DranasEmissary.java b/Mage.Sets/src/mage/cards/d/DranasEmissary.java index d25ae4b9f3b..e15994873c5 100644 --- a/Mage.Sets/src/mage/cards/d/DranasEmissary.java +++ b/Mage.Sets/src/mage/cards/d/DranasEmissary.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DrasticRevelation.java b/Mage.Sets/src/mage/cards/d/DrasticRevelation.java index b9dc1c5fb6c..6c367e48bfe 100644 --- a/Mage.Sets/src/mage/cards/d/DrasticRevelation.java +++ b/Mage.Sets/src/mage/cards/d/DrasticRevelation.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -39,6 +38,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/Dread.java b/Mage.Sets/src/mage/cards/d/Dread.java index 1870f62fd9d..27cc72d043d 100644 --- a/Mage.Sets/src/mage/cards/d/Dread.java +++ b/Mage.Sets/src/mage/cards/d/Dread.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.PutIntoGraveFromAnywhereSourceTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DreadCacodemon.java b/Mage.Sets/src/mage/cards/d/DreadCacodemon.java index 4e733a5ebca..6b2c9ae436e 100644 --- a/Mage.Sets/src/mage/cards/d/DreadCacodemon.java +++ b/Mage.Sets/src/mage/cards/d/DreadCacodemon.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ diff --git a/Mage.Sets/src/mage/cards/d/DreadDefiler.java b/Mage.Sets/src/mage/cards/d/DreadDefiler.java index abfb2cf104b..449b09ca719 100644 --- a/Mage.Sets/src/mage/cards/d/DreadDefiler.java +++ b/Mage.Sets/src/mage/cards/d/DreadDefiler.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DreadDrone.java b/Mage.Sets/src/mage/cards/d/DreadDrone.java index 1ec9982755c..d135c0f45bb 100644 --- a/Mage.Sets/src/mage/cards/d/DreadDrone.java +++ b/Mage.Sets/src/mage/cards/d/DreadDrone.java @@ -28,15 +28,16 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.EldraziSpawnToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DreadOfNight.java b/Mage.Sets/src/mage/cards/d/DreadOfNight.java index 3b7146117ab..8b1fb414989 100644 --- a/Mage.Sets/src/mage/cards/d/DreadOfNight.java +++ b/Mage.Sets/src/mage/cards/d/DreadOfNight.java @@ -27,19 +27,19 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DreadReaper.java b/Mage.Sets/src/mage/cards/d/DreadReaper.java index 7220704d6c9..9886113f4f7 100644 --- a/Mage.Sets/src/mage/cards/d/DreadReaper.java +++ b/Mage.Sets/src/mage/cards/d/DreadReaper.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DreadReturn.java b/Mage.Sets/src/mage/cards/d/DreadReturn.java index 4a31b6639d8..216abb3de20 100644 --- a/Mage.Sets/src/mage/cards/d/DreadReturn.java +++ b/Mage.Sets/src/mage/cards/d/DreadReturn.java @@ -27,19 +27,20 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TimingRule; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TimingRule; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/d/DreadSlag.java b/Mage.Sets/src/mage/cards/d/DreadSlag.java index 4f0122cc1ec..060f33ee9b9 100644 --- a/Mage.Sets/src/mage/cards/d/DreadSlag.java +++ b/Mage.Sets/src/mage/cards/d/DreadSlag.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DreadSlaver.java b/Mage.Sets/src/mage/cards/d/DreadSlaver.java index 7e5a6d1e4d8..27cc2172745 100644 --- a/Mage.Sets/src/mage/cards/d/DreadSlaver.java +++ b/Mage.Sets/src/mage/cards/d/DreadSlaver.java @@ -27,13 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; @@ -43,10 +36,13 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** diff --git a/Mage.Sets/src/mage/cards/d/DreadSpecter.java b/Mage.Sets/src/mage/cards/d/DreadSpecter.java index 788ff32891f..066cf8ea541 100644 --- a/Mage.Sets/src/mage/cards/d/DreadSpecter.java +++ b/Mage.Sets/src/mage/cards/d/DreadSpecter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author djbrez diff --git a/Mage.Sets/src/mage/cards/d/DreadStatuary.java b/Mage.Sets/src/mage/cards/d/DreadStatuary.java index 28370b65b20..fc773c1c88f 100644 --- a/Mage.Sets/src/mage/cards/d/DreadStatuary.java +++ b/Mage.Sets/src/mage/cards/d/DreadStatuary.java @@ -28,10 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,8 +35,13 @@ import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DreadSummons.java b/Mage.Sets/src/mage/cards/d/DreadSummons.java index c5b7cd45fcd..90d6eaa95a6 100644 --- a/Mage.Sets/src/mage/cards/d/DreadSummons.java +++ b/Mage.Sets/src/mage/cards/d/DreadSummons.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -42,6 +40,9 @@ import mage.game.Game; import mage.game.permanent.token.ZombieToken; import mage.players.Player; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreadWarlock.java b/Mage.Sets/src/mage/cards/d/DreadWarlock.java index 749e9be7f97..dd942e76491 100644 --- a/Mage.Sets/src/mage/cards/d/DreadWarlock.java +++ b/Mage.Sets/src/mage/cards/d/DreadWarlock.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleEvasionAbility; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/Dreadbore.java b/Mage.Sets/src/mage/cards/d/Dreadbore.java index 2cc0626e8e9..e03d969c318 100644 --- a/Mage.Sets/src/mage/cards/d/Dreadbore.java +++ b/Mage.Sets/src/mage/cards/d/Dreadbore.java @@ -27,10 +27,10 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage.Sets/src/mage/cards/d/DreadbringerLampads.java b/Mage.Sets/src/mage/cards/d/DreadbringerLampads.java index 8c8fdde077e..92be977439e 100644 --- a/Mage.Sets/src/mage/cards/d/DreadbringerLampads.java +++ b/Mage.Sets/src/mage/cards/d/DreadbringerLampads.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.abilityword.ConstellationAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreadshipReef.java b/Mage.Sets/src/mage/cards/d/DreadshipReef.java index c1cbcc2c16a..08c7c7b5929 100644 --- a/Mage.Sets/src/mage/cards/d/DreadshipReef.java +++ b/Mage.Sets/src/mage/cards/d/DreadshipReef.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; @@ -45,6 +44,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dreadwaters.java b/Mage.Sets/src/mage/cards/d/Dreadwaters.java index 138d93ab908..2446908dd3d 100644 --- a/Mage.Sets/src/mage/cards/d/Dreadwaters.java +++ b/Mage.Sets/src/mage/cards/d/Dreadwaters.java @@ -27,11 +27,11 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; diff --git a/Mage.Sets/src/mage/cards/d/Dreadwing.java b/Mage.Sets/src/mage/cards/d/Dreadwing.java index 40b03501687..8cf0b1ad538 100644 --- a/Mage.Sets/src/mage/cards/d/Dreadwing.java +++ b/Mage.Sets/src/mage/cards/d/Dreadwing.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DreamCache.java b/Mage.Sets/src/mage/cards/d/DreamCache.java index aea8b3a573a..2a8a292930c 100644 --- a/Mage.Sets/src/mage/cards/d/DreamCache.java +++ b/Mage.Sets/src/mage/cards/d/DreamCache.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DreamChisel.java b/Mage.Sets/src/mage/cards/d/DreamChisel.java index 372317c4684..abc1aaf198b 100644 --- a/Mage.Sets/src/mage/cards/d/DreamChisel.java +++ b/Mage.Sets/src/mage/cards/d/DreamChisel.java @@ -27,16 +27,17 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.other.FaceDownPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DreamFracture.java b/Mage.Sets/src/mage/cards/d/DreamFracture.java index bdd7f77cb9b..f57f1cf6357 100644 --- a/Mage.Sets/src/mage/cards/d/DreamFracture.java +++ b/Mage.Sets/src/mage/cards/d/DreamFracture.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DreamHalls.java b/Mage.Sets/src/mage/cards/d/DreamHalls.java index 6cb8130c679..3226596aadb 100644 --- a/Mage.Sets/src/mage/cards/d/DreamHalls.java +++ b/Mage.Sets/src/mage/cards/d/DreamHalls.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceIsSpellCondition; @@ -36,18 +35,15 @@ import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AnotherCardPredicate; import mage.filter.predicate.mageobject.SharesColorWithSourcePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreamLeash.java b/Mage.Sets/src/mage/cards/d/DreamLeash.java index 809e8d331ce..15c14426c46 100644 --- a/Mage.Sets/src/mage/cards/d/DreamLeash.java +++ b/Mage.Sets/src/mage/cards/d/DreamLeash.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author maxlebedev diff --git a/Mage.Sets/src/mage/cards/d/DreamPillager.java b/Mage.Sets/src/mage/cards/d/DreamPillager.java index 11d602be697..6beaff4cb19 100644 --- a/Mage.Sets/src/mage/cards/d/DreamPillager.java +++ b/Mage.Sets/src/mage/cards/d/DreamPillager.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -41,11 +39,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -53,6 +47,9 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreamProwler.java b/Mage.Sets/src/mage/cards/d/DreamProwler.java index f4f41bd41cc..f4743faf126 100644 --- a/Mage.Sets/src/mage/cards/d/DreamProwler.java +++ b/Mage.Sets/src/mage/cards/d/DreamProwler.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DreamSalvage.java b/Mage.Sets/src/mage/cards/d/DreamSalvage.java index bff5a22e989..b7848104e0c 100644 --- a/Mage.Sets/src/mage/cards/d/DreamSalvage.java +++ b/Mage.Sets/src/mage/cards/d/DreamSalvage.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -44,6 +40,11 @@ import mage.players.Player; import mage.target.common.TargetOpponent; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DreamStalker.java b/Mage.Sets/src/mage/cards/d/DreamStalker.java index 16381c96368..173fb1a4772 100644 --- a/Mage.Sets/src/mage/cards/d/DreamStalker.java +++ b/Mage.Sets/src/mage/cards/d/DreamStalker.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreamThief.java b/Mage.Sets/src/mage/cards/d/DreamThief.java index 7e63448138b..47f357f2c90 100644 --- a/Mage.Sets/src/mage/cards/d/DreamThief.java +++ b/Mage.Sets/src/mage/cards/d/DreamThief.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.watchers.common.SpellsCastWatcher; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DreamThrush.java b/Mage.Sets/src/mage/cards/d/DreamThrush.java index fa79453e0a2..a911c1fed5c 100644 --- a/Mage.Sets/src/mage/cards/d/DreamThrush.java +++ b/Mage.Sets/src/mage/cards/d/DreamThrush.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.Target; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreamTwist.java b/Mage.Sets/src/mage/cards/d/DreamTwist.java index cd79a0dc48a..7fc61199628 100644 --- a/Mage.Sets/src/mage/cards/d/DreamTwist.java +++ b/Mage.Sets/src/mage/cards/d/DreamTwist.java @@ -27,12 +27,12 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/d/DreambornMuse.java b/Mage.Sets/src/mage/cards/d/DreambornMuse.java index 09d876c49a7..791adc9e06a 100644 --- a/Mage.Sets/src/mage/cards/d/DreambornMuse.java +++ b/Mage.Sets/src/mage/cards/d/DreambornMuse.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.CardsInTargetPlayerHandCount; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author cbrianhill diff --git a/Mage.Sets/src/mage/cards/d/Dreamcatcher.java b/Mage.Sets/src/mage/cards/d/Dreamcatcher.java index 58f859a98e5..a50450228e5 100644 --- a/Mage.Sets/src/mage/cards/d/Dreamcatcher.java +++ b/Mage.Sets/src/mage/cards/d/Dreamcatcher.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterSpiritOrArcaneCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreampodDruid.java b/Mage.Sets/src/mage/cards/d/DreampodDruid.java index 5dc74b143ab..155468ef5f2 100644 --- a/Mage.Sets/src/mage/cards/d/DreampodDruid.java +++ b/Mage.Sets/src/mage/cards/d/DreampodDruid.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.EnchantedSourceCondition; @@ -40,6 +39,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.game.permanent.token.SaprolingToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreamsGrip.java b/Mage.Sets/src/mage/cards/d/DreamsGrip.java index 89b01436ab9..f1bed89c70a 100644 --- a/Mage.Sets/src/mage/cards/d/DreamsGrip.java +++ b/Mage.Sets/src/mage/cards/d/DreamsGrip.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.TapTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java b/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java index fb93bb2771f..6e762015098 100644 --- a/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java +++ b/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DreamspoilerWitches.java b/Mage.Sets/src/mage/cards/d/DreamspoilerWitches.java index 12c44dbb53b..2c4f1b7644f 100644 --- a/Mage.Sets/src/mage/cards/d/DreamspoilerWitches.java +++ b/Mage.Sets/src/mage/cards/d/DreamspoilerWitches.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java b/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java index ad24e32f98f..cf181285ff3 100644 --- a/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java +++ b/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/Dreamwinder.java b/Mage.Sets/src/mage/cards/d/Dreamwinder.java index 9d88f280b70..350ccb244f3 100644 --- a/Mage.Sets/src/mage/cards/d/Dreamwinder.java +++ b/Mage.Sets/src/mage/cards/d/Dreamwinder.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author cbt33, LevelX2 (Walk the Aeons), KholdFuzion (Dandan) diff --git a/Mage.Sets/src/mage/cards/d/Dredge.java b/Mage.Sets/src/mage/cards/d/Dredge.java index 60247271134..a606db3c16e 100644 --- a/Mage.Sets/src/mage/cards/d/Dredge.java +++ b/Mage.Sets/src/mage/cards/d/Dredge.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.SacrificeControllerEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DregMangler.java b/Mage.Sets/src/mage/cards/d/DregMangler.java index 877ad1d4618..7f418c7ff65 100644 --- a/Mage.Sets/src/mage/cards/d/DregMangler.java +++ b/Mage.Sets/src/mage/cards/d/DregMangler.java @@ -27,13 +27,13 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ScavengeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DregReaver.java b/Mage.Sets/src/mage/cards/d/DregReaver.java index a8e2f352bf9..7f00e9b82ce 100644 --- a/Mage.Sets/src/mage/cards/d/DregReaver.java +++ b/Mage.Sets/src/mage/cards/d/DregReaver.java @@ -28,11 +28,12 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DregsOfSorrow.java b/Mage.Sets/src/mage/cards/d/DregsOfSorrow.java index aed15220212..2fb0f3d0661 100644 --- a/Mage.Sets/src/mage/cards/d/DregsOfSorrow.java +++ b/Mage.Sets/src/mage/cards/d/DregsOfSorrow.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DregscapeZombie.java b/Mage.Sets/src/mage/cards/d/DregscapeZombie.java index 45188e231bc..378d612d5ad 100644 --- a/Mage.Sets/src/mage/cards/d/DregscapeZombie.java +++ b/Mage.Sets/src/mage/cards/d/DregscapeZombie.java @@ -28,13 +28,14 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/Drekavac.java b/Mage.Sets/src/mage/cards/d/Drekavac.java index 19e54acc572..4c526b0f846 100644 --- a/Mage.Sets/src/mage/cards/d/Drekavac.java +++ b/Mage.Sets/src/mage/cards/d/Drekavac.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -40,6 +39,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/Drelnoch.java b/Mage.Sets/src/mage/cards/d/Drelnoch.java index ce760601851..feef97e9626 100644 --- a/Mage.Sets/src/mage/cards/d/Drelnoch.java +++ b/Mage.Sets/src/mage/cards/d/Drelnoch.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DriftOfPhantasms.java b/Mage.Sets/src/mage/cards/d/DriftOfPhantasms.java index e4f76f4bf73..53afc15eba4 100644 --- a/Mage.Sets/src/mage/cards/d/DriftOfPhantasms.java +++ b/Mage.Sets/src/mage/cards/d/DriftOfPhantasms.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DrifterIlDal.java b/Mage.Sets/src/mage/cards/d/DrifterIlDal.java index 9b222817f88..10f51cc3d95 100644 --- a/Mage.Sets/src/mage/cards/d/DrifterIlDal.java +++ b/Mage.Sets/src/mage/cards/d/DrifterIlDal.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DriftingDjinn.java b/Mage.Sets/src/mage/cards/d/DriftingDjinn.java index 9709ec04dfa..0c72e28c4b2 100644 --- a/Mage.Sets/src/mage/cards/d/DriftingDjinn.java +++ b/Mage.Sets/src/mage/cards/d/DriftingDjinn.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,8 +36,11 @@ import mage.abilities.keyword.CyclingAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/d/DriftingMeadow.java b/Mage.Sets/src/mage/cards/d/DriftingMeadow.java index 09466ce06ff..53ad4549cef 100644 --- a/Mage.Sets/src/mage/cards/d/DriftingMeadow.java +++ b/Mage.Sets/src/mage/cards/d/DriftingMeadow.java @@ -29,14 +29,15 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DriftingShade.java b/Mage.Sets/src/mage/cards/d/DriftingShade.java index fcbd3e38595..ca40b1bb0ab 100644 --- a/Mage.Sets/src/mage/cards/d/DriftingShade.java +++ b/Mage.Sets/src/mage/cards/d/DriftingShade.java @@ -28,9 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -38,6 +35,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java index 0a222ad25df..8ef2421dd7e 100644 --- a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java +++ b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author wetterlicht diff --git a/Mage.Sets/src/mage/cards/d/DrippingDead.java b/Mage.Sets/src/mage/cards/d/DrippingDead.java index f4191f4d099..153ee379cae 100644 --- a/Mage.Sets/src/mage/cards/d/DrippingDead.java +++ b/Mage.Sets/src/mage/cards/d/DrippingDead.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DrippingTongueZubera.java b/Mage.Sets/src/mage/cards/d/DrippingTongueZubera.java index a6a5fff2140..00db86c5842 100644 --- a/Mage.Sets/src/mage/cards/d/DrippingTongueZubera.java +++ b/Mage.Sets/src/mage/cards/d/DrippingTongueZubera.java @@ -28,18 +28,18 @@ package mage.cards.d; -import java.util.UUID; - -import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SpiritToken; import mage.watchers.common.ZuberasDiedWatcher; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java b/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java index c42eaeff045..55238d35df6 100644 --- a/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java @@ -27,13 +27,13 @@ */ package mage.cards.d; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.Filter; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java b/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java index 1ec1cef2b6f..25d72826830 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -38,11 +35,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java index 58c8eb82246..cf84bd56837 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DrogskolReaver.java b/Mage.Sets/src/mage/cards/d/DrogskolReaver.java index 8cd22c101a1..28c89d548ba 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolReaver.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolReaver.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DrogskolShieldmate.java b/Mage.Sets/src/mage/cards/d/DrogskolShieldmate.java index e203f56866e..7f43192495a 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolShieldmate.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolShieldmate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DroidCommando.java b/Mage.Sets/src/mage/cards/d/DroidCommando.java index 550a9e55c6d..919933faf12 100644 --- a/Mage.Sets/src/mage/cards/d/DroidCommando.java +++ b/Mage.Sets/src/mage/cards/d/DroidCommando.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DroidFactory.java b/Mage.Sets/src/mage/cards/d/DroidFactory.java index c28dc7a279e..929ebbaff08 100644 --- a/Mage.Sets/src/mage/cards/d/DroidFactory.java +++ b/Mage.Sets/src/mage/cards/d/DroidFactory.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.ArrayList; -import java.util.UUID; import mage.MageObject; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; @@ -48,6 +47,9 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author Styxo @@ -91,7 +93,7 @@ public class DroidFactory extends CardImpl { subtypePredicates.add(new SubtypePredicate("Plains")); subtypePredicates.add(new SubtypePredicate("Island")); filter.add(Predicates.or(subtypePredicates)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); } diff --git a/Mage.Sets/src/mage/cards/d/DroidFoundry.java b/Mage.Sets/src/mage/cards/d/DroidFoundry.java index 4c26d322df1..3db7b8fbed9 100644 --- a/Mage.Sets/src/mage/cards/d/DroidFoundry.java +++ b/Mage.Sets/src/mage/cards/d/DroidFoundry.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/Droideka.java b/Mage.Sets/src/mage/cards/d/Droideka.java index 233a960a3f9..75413ba4bfd 100644 --- a/Mage.Sets/src/mage/cards/d/Droideka.java +++ b/Mage.Sets/src/mage/cards/d/Droideka.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetStackObject; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DromadPurebred.java b/Mage.Sets/src/mage/cards/d/DromadPurebred.java index 70063097142..6112f9754ac 100644 --- a/Mage.Sets/src/mage/cards/d/DromadPurebred.java +++ b/Mage.Sets/src/mage/cards/d/DromadPurebred.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Derpthemeus diff --git a/Mage.Sets/src/mage/cards/d/DromarTheBanisher.java b/Mage.Sets/src/mage/cards/d/DromarTheBanisher.java index adb385450cd..70c8bb497f6 100644 --- a/Mage.Sets/src/mage/cards/d/DromarTheBanisher.java +++ b/Mage.Sets/src/mage/cards/d/DromarTheBanisher.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,11 +40,14 @@ import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 @@ -54,7 +56,7 @@ public class DromarTheBanisher extends CardImpl { public DromarTheBanisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/d/DromarsAttendant.java b/Mage.Sets/src/mage/cards/d/DromarsAttendant.java index 46c726f09c4..adc16b011b4 100644 --- a/Mage.Sets/src/mage/cards/d/DromarsAttendant.java +++ b/Mage.Sets/src/mage/cards/d/DromarsAttendant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DromarsCavern.java b/Mage.Sets/src/mage/cards/d/DromarsCavern.java index 099a10e7642..d5bf6e1b99e 100644 --- a/Mage.Sets/src/mage/cards/d/DromarsCavern.java +++ b/Mage.Sets/src/mage/cards/d/DromarsCavern.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DromarsCharm.java b/Mage.Sets/src/mage/cards/d/DromarsCharm.java index 1a4c450f7bd..1c4cc40be4e 100644 --- a/Mage.Sets/src/mage/cards/d/DromarsCharm.java +++ b/Mage.Sets/src/mage/cards/d/DromarsCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.target.TargetSpell; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DromokaCaptain.java b/Mage.Sets/src/mage/cards/d/DromokaCaptain.java index a463d68be17..ce3fc8c8e6b 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DromokaCaptain.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.keyword.BolsterEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java b/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java index dcd3bfd0a42..0aef416049f 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java +++ b/Mage.Sets/src/mage/cards/d/DromokaDunecaster.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DromokaMonument.java b/Mage.Sets/src/mage/cards/d/DromokaMonument.java index 02a0e7e8598..4478ebc7051 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaMonument.java +++ b/Mage.Sets/src/mage/cards/d/DromokaMonument.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DromokaTheEternal.java b/Mage.Sets/src/mage/cards/d/DromokaTheEternal.java index 1df06ff6908..ffff611ef12 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaTheEternal.java +++ b/Mage.Sets/src/mage/cards/d/DromokaTheEternal.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; import mage.abilities.effects.keyword.BolsterEffect; @@ -35,8 +34,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -45,7 +47,7 @@ public class DromokaTheEternal extends CardImpl { public DromokaTheEternal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/d/DromokaWarrior.java b/Mage.Sets/src/mage/cards/d/DromokaWarrior.java index 2635ee57d1b..29ea0ff95a6 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaWarrior.java +++ b/Mage.Sets/src/mage/cards/d/DromokaWarrior.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DromokasCommand.java b/Mage.Sets/src/mage/cards/d/DromokasCommand.java index 51bb89c387e..e7105a34d24 100644 --- a/Mage.Sets/src/mage/cards/d/DromokasCommand.java +++ b/Mage.Sets/src/mage/cards/d/DromokasCommand.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.FightTargetsEffect; @@ -49,6 +48,8 @@ import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DromokasGift.java b/Mage.Sets/src/mage/cards/d/DromokasGift.java index 98f1c6e5851..6f9fbc9aa43 100644 --- a/Mage.Sets/src/mage/cards/d/DromokasGift.java +++ b/Mage.Sets/src/mage/cards/d/DromokasGift.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.keyword.BolsterEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dromosaur.java b/Mage.Sets/src/mage/cards/d/Dromosaur.java index c926e7b2800..6705615a75a 100644 --- a/Mage.Sets/src/mage/cards/d/Dromosaur.java +++ b/Mage.Sets/src/mage/cards/d/Dromosaur.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DroneHolocron.java b/Mage.Sets/src/mage/cards/d/DroneHolocron.java index dedccc96165..49b34f7cdd5 100644 --- a/Mage.Sets/src/mage/cards/d/DroneHolocron.java +++ b/Mage.Sets/src/mage/cards/d/DroneHolocron.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DronepackKindred.java b/Mage.Sets/src/mage/cards/d/DronepackKindred.java index 5c49d6827e5..eb83dcacfab 100644 --- a/Mage.Sets/src/mage/cards/d/DronepackKindred.java +++ b/Mage.Sets/src/mage/cards/d/DronepackKindred.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DroolingGroodion.java b/Mage.Sets/src/mage/cards/d/DroolingGroodion.java index 3270454be73..53d4f9ceedb 100644 --- a/Mage.Sets/src/mage/cards/d/DroolingGroodion.java +++ b/Mage.Sets/src/mage/cards/d/DroolingGroodion.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -36,12 +35,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherTargetPredicate; @@ -50,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DroolingOgre.java b/Mage.Sets/src/mage/cards/d/DroolingOgre.java index 33046456168..445f6e513de 100644 --- a/Mage.Sets/src/mage/cards/d/DroolingOgre.java +++ b/Mage.Sets/src/mage/cards/d/DroolingOgre.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -48,6 +47,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author wetterlicht diff --git a/Mage.Sets/src/mage/cards/d/DropOfHoney.java b/Mage.Sets/src/mage/cards/d/DropOfHoney.java index 4a2512ea55e..055d41275b2 100644 --- a/Mage.Sets/src/mage/cards/d/DropOfHoney.java +++ b/Mage.Sets/src/mage/cards/d/DropOfHoney.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -49,6 +48,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author MarcoMarin, but I mostly copied from LevelX2's PorphyryNodes :) diff --git a/Mage.Sets/src/mage/cards/d/DrossCrocodile.java b/Mage.Sets/src/mage/cards/d/DrossCrocodile.java index 5a3820a6406..b9b905ddc81 100644 --- a/Mage.Sets/src/mage/cards/d/DrossCrocodile.java +++ b/Mage.Sets/src/mage/cards/d/DrossCrocodile.java @@ -27,11 +27,12 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DrossGolem.java b/Mage.Sets/src/mage/cards/d/DrossGolem.java index 6889edf8ee7..e7cf055ee20 100644 --- a/Mage.Sets/src/mage/cards/d/DrossGolem.java +++ b/Mage.Sets/src/mage/cards/d/DrossGolem.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.AffinityForLandTypeAbility; import mage.abilities.keyword.FearAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DrossHarvester.java b/Mage.Sets/src/mage/cards/d/DrossHarvester.java index 6385f8caa85..208fb240603 100644 --- a/Mage.Sets/src/mage/cards/d/DrossHarvester.java +++ b/Mage.Sets/src/mage/cards/d/DrossHarvester.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DrossHopper.java b/Mage.Sets/src/mage/cards/d/DrossHopper.java index 1ed292065ab..0d6e8a3df46 100644 --- a/Mage.Sets/src/mage/cards/d/DrossHopper.java +++ b/Mage.Sets/src/mage/cards/d/DrossHopper.java @@ -28,10 +28,6 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,8 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DrossProwler.java b/Mage.Sets/src/mage/cards/d/DrossProwler.java index 49cdffdced4..560e5c0278f 100644 --- a/Mage.Sets/src/mage/cards/d/DrossProwler.java +++ b/Mage.Sets/src/mage/cards/d/DrossProwler.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DrossRipper.java b/Mage.Sets/src/mage/cards/d/DrossRipper.java index 59f6ad670bd..e0a576afaa8 100644 --- a/Mage.Sets/src/mage/cards/d/DrossRipper.java +++ b/Mage.Sets/src/mage/cards/d/DrossRipper.java @@ -28,18 +28,18 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DrossScorpion.java b/Mage.Sets/src/mage/cards/d/DrossScorpion.java index 15412fcbc73..f60726ffb22 100644 --- a/Mage.Sets/src/mage/cards/d/DrossScorpion.java +++ b/Mage.Sets/src/mage/cards/d/DrossScorpion.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DroveOfElves.java b/Mage.Sets/src/mage/cards/d/DroveOfElves.java index 6ff0884660c..715205c48d7 100644 --- a/Mage.Sets/src/mage/cards/d/DroveOfElves.java +++ b/Mage.Sets/src/mage/cards/d/DroveOfElves.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -39,9 +35,14 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DrownInFilth.java b/Mage.Sets/src/mage/cards/d/DrownInFilth.java index 8fd59238e2a..394669b4b37 100644 --- a/Mage.Sets/src/mage/cards/d/DrownInFilth.java +++ b/Mage.Sets/src/mage/cards/d/DrownInFilth.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; @@ -38,9 +35,13 @@ import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffec import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DrownInSorrow.java b/Mage.Sets/src/mage/cards/d/DrownInSorrow.java index ccab0d01d8c..fa50b306a19 100644 --- a/Mage.Sets/src/mage/cards/d/DrownInSorrow.java +++ b/Mage.Sets/src/mage/cards/d/DrownInSorrow.java @@ -27,14 +27,15 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/Drowned.java b/Mage.Sets/src/mage/cards/d/Drowned.java index 26a52380249..69428c8b0a0 100644 --- a/Mage.Sets/src/mage/cards/d/Drowned.java +++ b/Mage.Sets/src/mage/cards/d/Drowned.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java b/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java index dfff2cbae6a..d31ca9379f2 100644 --- a/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java +++ b/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java @@ -28,24 +28,24 @@ package mage.cards.d; -import java.util.UUID; - import mage.abilities.CountType; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.InvertCondition; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DrownedRusalka.java b/Mage.Sets/src/mage/cards/d/DrownedRusalka.java index c6fdff37141..59e1e7457ad 100644 --- a/Mage.Sets/src/mage/cards/d/DrownedRusalka.java +++ b/Mage.Sets/src/mage/cards/d/DrownedRusalka.java @@ -27,14 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DrownerInitiate.java b/Mage.Sets/src/mage/cards/d/DrownerInitiate.java index f7f6c9faabb..874268d778c 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerInitiate.java +++ b/Mage.Sets/src/mage/cards/d/DrownerInitiate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfHope.java b/Mage.Sets/src/mage/cards/d/DrownerOfHope.java index 33ed8aff565..ef4ad1490db 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerOfHope.java +++ b/Mage.Sets/src/mage/cards/d/DrownerOfHope.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.token.EldraziScionToken; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java index d3941efe11b..b42cfe77b18 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java +++ b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +34,7 @@ import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -45,6 +43,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DrownyardBehemoth.java b/Mage.Sets/src/mage/cards/d/DrownyardBehemoth.java index dcbf143ae9f..f15652989f3 100644 --- a/Mage.Sets/src/mage/cards/d/DrownyardBehemoth.java +++ b/Mage.Sets/src/mage/cards/d/DrownyardBehemoth.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DrownyardExplorers.java b/Mage.Sets/src/mage/cards/d/DrownyardExplorers.java index f465a681c66..c413c20a218 100644 --- a/Mage.Sets/src/mage/cards/d/DrownyardExplorers.java +++ b/Mage.Sets/src/mage/cards/d/DrownyardExplorers.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.keyword.InvestigateEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DrownyardTemple.java b/Mage.Sets/src/mage/cards/d/DrownyardTemple.java index 35ff0980938..cac900d160b 100644 --- a/Mage.Sets/src/mage/cards/d/DrownyardTemple.java +++ b/Mage.Sets/src/mage/cards/d/DrownyardTemple.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DrudgeBeetle.java b/Mage.Sets/src/mage/cards/d/DrudgeBeetle.java index 880ec1830e4..cad4d0faa6f 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeBeetle.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeBeetle.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.ScavengeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DrudgeReavers.java b/Mage.Sets/src/mage/cards/d/DrudgeReavers.java index 0e91693e58e..9f0b0e40315 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeReavers.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeReavers.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java b/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java index e72927afefd..fb37213a8e5 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSkeletons.java @@ -28,15 +28,16 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java index 0abeb15866a..126a7ca3d31 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SkeletonToken; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DruidLyrist.java b/Mage.Sets/src/mage/cards/d/DruidLyrist.java index cf4e47b8f53..24d249a3a8c 100644 --- a/Mage.Sets/src/mage/cards/d/DruidLyrist.java +++ b/Mage.Sets/src/mage/cards/d/DruidLyrist.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DruidOfTheAnima.java b/Mage.Sets/src/mage/cards/d/DruidOfTheAnima.java index 550536a17d2..ba45fa0667b 100644 --- a/Mage.Sets/src/mage/cards/d/DruidOfTheAnima.java +++ b/Mage.Sets/src/mage/cards/d/DruidOfTheAnima.java @@ -28,14 +28,15 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DruidOfTheCowl.java b/Mage.Sets/src/mage/cards/d/DruidOfTheCowl.java index 3d9b371f63e..578a1fbb042 100644 --- a/Mage.Sets/src/mage/cards/d/DruidOfTheCowl.java +++ b/Mage.Sets/src/mage/cards/d/DruidOfTheCowl.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java index 876475f058d..6b2e685a0a4 100644 --- a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java +++ b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java @@ -27,17 +27,12 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -46,6 +41,8 @@ import mage.game.permanent.token.SaprolingToken; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DruidsCall.java b/Mage.Sets/src/mage/cards/d/DruidsCall.java index 0d234a8d658..851e499802d 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsCall.java +++ b/Mage.Sets/src/mage/cards/d/DruidsCall.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DealtDamageAttachedTriggeredAbility; import mage.abilities.dynamicvalue.common.NumericSetToEffectValues; @@ -45,6 +44,8 @@ import mage.game.permanent.token.SquirrelToken; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DruidsDeliverance.java b/Mage.Sets/src/mage/cards/d/DruidsDeliverance.java index 4fd41b50ae5..c99a99ef62e 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsDeliverance.java +++ b/Mage.Sets/src/mage/cards/d/DruidsDeliverance.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.PopulateEffect; import mage.abilities.effects.common.PreventDamageToControllerEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevleX2 diff --git a/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java b/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java index 624a55ca53d..c11e41e7e75 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java +++ b/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostPairedEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/d/DruidsRepository.java b/Mage.Sets/src/mage/cards/d/DruidsRepository.java index 0ea2ab7e2d7..d16b4825cf8 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsRepository.java +++ b/Mage.Sets/src/mage/cards/d/DruidsRepository.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/d/Drumhunter.java b/Mage.Sets/src/mage/cards/d/Drumhunter.java index 0af57152537..91121809263 100644 --- a/Mage.Sets/src/mage/cards/d/Drumhunter.java +++ b/Mage.Sets/src/mage/cards/d/Drumhunter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java b/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java index 102e6842555..dab5473457a 100644 --- a/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java +++ b/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DrySpell.java b/Mage.Sets/src/mage/cards/d/DrySpell.java index 193b1296eef..1a580b6b21c 100644 --- a/Mage.Sets/src/mage/cards/d/DrySpell.java +++ b/Mage.Sets/src/mage/cards/d/DrySpell.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DryadArbor.java b/Mage.Sets/src/mage/cards/d/DryadArbor.java index 9bb535fa7e2..4287ca8c22b 100644 --- a/Mage.Sets/src/mage/cards/d/DryadArbor.java +++ b/Mage.Sets/src/mage/cards/d/DryadArbor.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DryadMilitant.java b/Mage.Sets/src/mage/cards/d/DryadMilitant.java index ceb349f4ca0..45e1f154e9a 100644 --- a/Mage.Sets/src/mage/cards/d/DryadMilitant.java +++ b/Mage.Sets/src/mage/cards/d/DryadMilitant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DryadSophisticate.java b/Mage.Sets/src/mage/cards/d/DryadSophisticate.java index 890a9521907..a5868fdd371 100644 --- a/Mage.Sets/src/mage/cards/d/DryadSophisticate.java +++ b/Mage.Sets/src/mage/cards/d/DryadSophisticate.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.LandwalkAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DryadsCaress.java b/Mage.Sets/src/mage/cards/d/DryadsCaress.java index a51a2a80610..8d048a6c994 100644 --- a/Mage.Sets/src/mage/cards/d/DryadsCaress.java +++ b/Mage.Sets/src/mage/cards/d/DryadsCaress.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,6 +39,8 @@ import mage.constants.ColoredManaSymbol; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/d/DryadsFavor.java b/Mage.Sets/src/mage/cards/d/DryadsFavor.java index 69e42f4ef9a..0fc79a9cb03 100644 --- a/Mage.Sets/src/mage/cards/d/DryadsFavor.java +++ b/Mage.Sets/src/mage/cards/d/DryadsFavor.java @@ -28,7 +28,6 @@ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DualCasting.java b/Mage.Sets/src/mage/cards/d/DualCasting.java index 9cc3b6f0cdf..09d91612d74 100644 --- a/Mage.Sets/src/mage/cards/d/DualCasting.java +++ b/Mage.Sets/src/mage/cards/d/DualCasting.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,12 +38,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -53,6 +47,8 @@ import mage.target.TargetPermanent; import mage.target.TargetSpell; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DualShot.java b/Mage.Sets/src/mage/cards/d/DualShot.java index f6c8be430c7..3ca5e3cb783 100644 --- a/Mage.Sets/src/mage/cards/d/DualShot.java +++ b/Mage.Sets/src/mage/cards/d/DualShot.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DualcasterMage.java b/Mage.Sets/src/mage/cards/d/DualcasterMage.java index 3991ae3a160..af01feff424 100644 --- a/Mage.Sets/src/mage/cards/d/DualcasterMage.java +++ b/Mage.Sets/src/mage/cards/d/DualcasterMage.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DubiousChallenge.java b/Mage.Sets/src/mage/cards/d/DubiousChallenge.java index 75e753d9bb7..0cf6dbc6f4a 100644 --- a/Mage.Sets/src/mage/cards/d/DubiousChallenge.java +++ b/Mage.Sets/src/mage/cards/d/DubiousChallenge.java @@ -27,15 +27,10 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -45,6 +40,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DuctCrawler.java b/Mage.Sets/src/mage/cards/d/DuctCrawler.java index ca962927f3d..b4f4aaebc62 100644 --- a/Mage.Sets/src/mage/cards/d/DuctCrawler.java +++ b/Mage.Sets/src/mage/cards/d/DuctCrawler.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/d/DueRespect.java b/Mage.Sets/src/mage/cards/d/DueRespect.java index c4d42d743a1..1f33b8f3fc3 100644 --- a/Mage.Sets/src/mage/cards/d/DueRespect.java +++ b/Mage.Sets/src/mage/cards/d/DueRespect.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -41,6 +40,8 @@ import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/d/DuelingGrounds.java b/Mage.Sets/src/mage/cards/d/DuelingGrounds.java index f2652bbcc2b..a7a46ea19ab 100644 --- a/Mage.Sets/src/mage/cards/d/DuelingGrounds.java +++ b/Mage.Sets/src/mage/cards/d/DuelingGrounds.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.Set; -import java.util.UUID; - import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +42,9 @@ import mage.game.permanent.Permanent; import mage.watchers.common.AttackedThisTurnWatcher; import mage.watchers.common.BlockedThisTurnWatcher; +import java.util.Set; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DuelistsHeritage.java b/Mage.Sets/src/mage/cards/d/DuelistsHeritage.java index a9fdc13b05f..0eb93a2089f 100644 --- a/Mage.Sets/src/mage/cards/d/DuelistsHeritage.java +++ b/Mage.Sets/src/mage/cards/d/DuelistsHeritage.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DuergarAssailant.java b/Mage.Sets/src/mage/cards/d/DuergarAssailant.java index c1ec8f48e9a..e8af34ffa28 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarAssailant.java +++ b/Mage.Sets/src/mage/cards/d/DuergarAssailant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java b/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java index db912f2fbb5..8dcd9efa426 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java +++ b/Mage.Sets/src/mage/cards/d/DuergarCaveGuard.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java b/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java index eb6ee64215e..bded4aeb936 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java +++ b/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java b/Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java index 7d51177ffd7..03c917d07ed 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java b/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java index 24e4d89e65e..cb38f5b50c1 100644 --- a/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java +++ b/Mage.Sets/src/mage/cards/d/DukharaPeafowl.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DukharaScavenger.java b/Mage.Sets/src/mage/cards/d/DukharaScavenger.java index 1c5ac9cbf42..c7b44275922 100644 --- a/Mage.Sets/src/mage/cards/d/DukharaScavenger.java +++ b/Mage.Sets/src/mage/cards/d/DukharaScavenger.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.StaticFilters; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DulcetSirens.java b/Mage.Sets/src/mage/cards/d/DulcetSirens.java index f5a9d037a03..94e37770dd0 100644 --- a/Mage.Sets/src/mage/cards/d/DulcetSirens.java +++ b/Mage.Sets/src/mage/cards/d/DulcetSirens.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.target.Target; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java b/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java index 42adfc50a65..c282d8519cd 100644 --- a/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java +++ b/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -39,6 +38,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/d/Duneblast.java b/Mage.Sets/src/mage/cards/d/Duneblast.java index fd03d8e1af3..9ca45f07809 100644 --- a/Mage.Sets/src/mage/cards/d/Duneblast.java +++ b/Mage.Sets/src/mage/cards/d/Duneblast.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -42,6 +40,9 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DuneriderOutlaw.java b/Mage.Sets/src/mage/cards/d/DuneriderOutlaw.java index d7ff5ab626f..a17bb3452cf 100644 --- a/Mage.Sets/src/mage/cards/d/DuneriderOutlaw.java +++ b/Mage.Sets/src/mage/cards/d/DuneriderOutlaw.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.TriggeredAbility; @@ -39,9 +37,12 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/d/DungeonGeists.java b/Mage.Sets/src/mage/cards/d/DungeonGeists.java index d45fae3e5db..d4eadd63255 100644 --- a/Mage.Sets/src/mage/cards/d/DungeonGeists.java +++ b/Mage.Sets/src/mage/cards/d/DungeonGeists.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -37,13 +36,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.TargetController; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -54,6 +47,8 @@ import mage.target.Target; import mage.target.common.TargetCreaturePermanent; import mage.watchers.Watcher; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/d/DungeonShade.java b/Mage.Sets/src/mage/cards/d/DungeonShade.java index 8a2d558b2df..e1c7e5f54cf 100644 --- a/Mage.Sets/src/mage/cards/d/DungeonShade.java +++ b/Mage.Sets/src/mage/cards/d/DungeonShade.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DungroveElder.java b/Mage.Sets/src/mage/cards/d/DungroveElder.java index 445c0c50143..a7833ce80de 100644 --- a/Mage.Sets/src/mage/cards/d/DungroveElder.java +++ b/Mage.Sets/src/mage/cards/d/DungroveElder.java @@ -28,11 +28,6 @@ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -40,9 +35,14 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/Duplicant.java b/Mage.Sets/src/mage/cards/d/Duplicant.java index b19d11d6120..8c4cb2256f7 100644 --- a/Mage.Sets/src/mage/cards/d/Duplicant.java +++ b/Mage.Sets/src/mage/cards/d/Duplicant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -38,12 +37,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; @@ -51,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DurableHandicraft.java b/Mage.Sets/src/mage/cards/d/DurableHandicraft.java index 4c2be49db5c..fe8a380542b 100644 --- a/Mage.Sets/src/mage/cards/d/DurableHandicraft.java +++ b/Mage.Sets/src/mage/cards/d/DurableHandicraft.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/d/Duress.java b/Mage.Sets/src/mage/cards/d/Duress.java index 7df18ee75d7..879aef14a25 100644 --- a/Mage.Sets/src/mage/cards/d/Duress.java +++ b/Mage.Sets/src/mage/cards/d/Duress.java @@ -28,7 +28,6 @@ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DurkwoodBaloth.java b/Mage.Sets/src/mage/cards/d/DurkwoodBaloth.java index 34ac09e0b97..6baecad2685 100644 --- a/Mage.Sets/src/mage/cards/d/DurkwoodBaloth.java +++ b/Mage.Sets/src/mage/cards/d/DurkwoodBaloth.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.SuspendAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DurkwoodBoars.java b/Mage.Sets/src/mage/cards/d/DurkwoodBoars.java index 7a03fc1da08..50ff4d0a7e6 100644 --- a/Mage.Sets/src/mage/cards/d/DurkwoodBoars.java +++ b/Mage.Sets/src/mage/cards/d/DurkwoodBoars.java @@ -27,11 +27,12 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DuskFeaster.java b/Mage.Sets/src/mage/cards/d/DuskFeaster.java index 4b9afa1ec83..3b876799d13 100644 --- a/Mage.Sets/src/mage/cards/d/DuskFeaster.java +++ b/Mage.Sets/src/mage/cards/d/DuskFeaster.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.HashSet; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,14 +37,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.HashSet; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/d/DuskImp.java b/Mage.Sets/src/mage/cards/d/DuskImp.java index 5abdc08a21b..d0dadac4b45 100644 --- a/Mage.Sets/src/mage/cards/d/DuskImp.java +++ b/Mage.Sets/src/mage/cards/d/DuskImp.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DuskUrchins.java b/Mage.Sets/src/mage/cards/d/DuskUrchins.java index 82a68bda5ee..160790ba03a 100644 --- a/Mage.Sets/src/mage/cards/d/DuskUrchins.java +++ b/Mage.Sets/src/mage/cards/d/DuskUrchins.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/d/DuskdaleWurm.java b/Mage.Sets/src/mage/cards/d/DuskdaleWurm.java index bb98c777389..637bb1f7a3f 100644 --- a/Mage.Sets/src/mage/cards/d/DuskdaleWurm.java +++ b/Mage.Sets/src/mage/cards/d/DuskdaleWurm.java @@ -28,12 +28,13 @@ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DuskhunterBat.java b/Mage.Sets/src/mage/cards/d/DuskhunterBat.java index 43cf2209d97..cf3397b86b5 100644 --- a/Mage.Sets/src/mage/cards/d/DuskhunterBat.java +++ b/Mage.Sets/src/mage/cards/d/DuskhunterBat.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java b/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java index 4b12cdf56d7..291c185ffc1 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -50,6 +49,8 @@ import mage.game.events.ZoneChangeEvent; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth and LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java b/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java index 6798c34c55d..09c55b8e447 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleProwler.java b/Mage.Sets/src/mage/cards/d/DuskmantleProwler.java index 52089d83a1f..05d5853e9da 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleProwler.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleProwler.java @@ -27,13 +27,14 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ExaltedAbility; +import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java b/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java index d4c69f27969..12b1e4a6209 100644 --- a/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java +++ b/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java @@ -27,25 +27,21 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DuskriderFalcon.java b/Mage.Sets/src/mage/cards/d/DuskriderFalcon.java index 373edac0740..fdccbb75262 100644 --- a/Mage.Sets/src/mage/cards/d/DuskriderFalcon.java +++ b/Mage.Sets/src/mage/cards/d/DuskriderFalcon.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java b/Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java index 613f1dcd21d..da73f1c5ec7 100644 --- a/Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java +++ b/Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +35,9 @@ import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.SuspendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/Duskwalker.java b/Mage.Sets/src/mage/cards/d/Duskwalker.java index 360c478e758..169725ef143 100644 --- a/Mage.Sets/src/mage/cards/d/Duskwalker.java +++ b/Mage.Sets/src/mage/cards/d/Duskwalker.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/d/Duskworker.java b/Mage.Sets/src/mage/cards/d/Duskworker.java index e763669f17d..8900aab7752 100644 --- a/Mage.Sets/src/mage/cards/d/Duskworker.java +++ b/Mage.Sets/src/mage/cards/d/Duskworker.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/d/DustBowl.java b/Mage.Sets/src/mage/cards/d/DustBowl.java index 2d78701ca64..fc75be21971 100644 --- a/Mage.Sets/src/mage/cards/d/DustBowl.java +++ b/Mage.Sets/src/mage/cards/d/DustBowl.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -44,6 +43,8 @@ import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DustCorona.java b/Mage.Sets/src/mage/cards/d/DustCorona.java index edc42938e61..6bd7a77d1bd 100644 --- a/Mage.Sets/src/mage/cards/d/DustCorona.java +++ b/Mage.Sets/src/mage/cards/d/DustCorona.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -38,16 +37,14 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/DustElemental.java b/Mage.Sets/src/mage/cards/d/DustElemental.java index 7326f92ce0e..4d2ded5601c 100644 --- a/Mage.Sets/src/mage/cards/d/DustElemental.java +++ b/Mage.Sets/src/mage/cards/d/DustElemental.java @@ -27,18 +27,19 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; +import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Zeplar1_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/d/DustOfMoments.java b/Mage.Sets/src/mage/cards/d/DustOfMoments.java index 529125a9d16..03deb130c9b 100644 --- a/Mage.Sets/src/mage/cards/d/DustOfMoments.java +++ b/Mage.Sets/src/mage/cards/d/DustOfMoments.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.List; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -49,6 +47,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** * * @author Gal Lerman diff --git a/Mage.Sets/src/mage/cards/d/DustStalker.java b/Mage.Sets/src/mage/cards/d/DustStalker.java index 82bcf198c44..d2e04e3b97e 100644 --- a/Mage.Sets/src/mage/cards/d/DustStalker.java +++ b/Mage.Sets/src/mage/cards/d/DustStalker.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DustToDust.java b/Mage.Sets/src/mage/cards/d/DustToDust.java index 9b7b238fd0e..d2a1cb0dc64 100644 --- a/Mage.Sets/src/mage/cards/d/DustToDust.java +++ b/Mage.Sets/src/mage/cards/d/DustToDust.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactPermanent; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DutifulAttendant.java b/Mage.Sets/src/mage/cards/d/DutifulAttendant.java index a268fa2e1d4..704ace11774 100644 --- a/Mage.Sets/src/mage/cards/d/DutifulAttendant.java +++ b/Mage.Sets/src/mage/cards/d/DutifulAttendant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.AnotherCardPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DutifulReturn.java b/Mage.Sets/src/mage/cards/d/DutifulReturn.java index f33b54a620f..78a8ccfd75b 100644 --- a/Mage.Sets/src/mage/cards/d/DutifulReturn.java +++ b/Mage.Sets/src/mage/cards/d/DutifulReturn.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DutifulThrull.java b/Mage.Sets/src/mage/cards/d/DutifulThrull.java index 9b6b934a62a..2ca2ec82795 100644 --- a/Mage.Sets/src/mage/cards/d/DutifulThrull.java +++ b/Mage.Sets/src/mage/cards/d/DutifulThrull.java @@ -27,18 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DutyBoundDead.java b/Mage.Sets/src/mage/cards/d/DutyBoundDead.java index c3b9de94e71..994c001d6c8 100644 --- a/Mage.Sets/src/mage/cards/d/DutyBoundDead.java +++ b/Mage.Sets/src/mage/cards/d/DutyBoundDead.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java b/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java index e0080af8131..fe4e31a3690 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenArmorer.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.HashSet; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -52,6 +50,9 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.HashSet; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenArmory.java b/Mage.Sets/src/mage/cards/d/DwarvenArmory.java index 966e1745d17..1a3e00ce19c 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenArmory.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenArmory.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.IsStepCondition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBerserker.java b/Mage.Sets/src/mage/cards/d/DwarvenBerserker.java index e7192589f31..2a587b4a8c7 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBerserker.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBerserker.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java index 989ba43d52f..283eb552c69 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java b/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java index c7715b94512..720a2c134f8 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenCatapult.java b/Mage.Sets/src/mage/cards/d/DwarvenCatapult.java index cd58a256922..7c19a006303 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenCatapult.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenCatapult.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageAllControlledTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java index 79a53dec7b6..e71b5323d11 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java @@ -27,9 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,11 +34,14 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/d/DwarvenDriller.java b/Mage.Sets/src/mage/cards/d/DwarvenDriller.java index bc1738a89f0..6f27fbbc3b5 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenDriller.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenDriller.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/d/DwarvenGrunt.java b/Mage.Sets/src/mage/cards/d/DwarvenGrunt.java index 78a35222fcc..9aed0796fde 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenGrunt.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenGrunt.java @@ -27,12 +27,13 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DwarvenHold.java b/Mage.Sets/src/mage/cards/d/DwarvenHold.java index 27195fa6e6b..baa3848ad02 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenHold.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenHold.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -50,6 +49,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/d/DwarvenLandslide.java b/Mage.Sets/src/mage/cards/d/DwarvenLandslide.java index 6676dcb5f4a..afb031bfc4e 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenLandslide.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenLandslide.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.condition.common.KickedCondition; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java b/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java index 41b27e32602..fb064024d32 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenMiner.java b/Mage.Sets/src/mage/cards/d/DwarvenMiner.java index ff98af1ae64..b490e756411 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenMiner.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenMiner.java @@ -5,7 +5,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -18,6 +17,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author nick.myers diff --git a/Mage.Sets/src/mage/cards/d/DwarvenNomad.java b/Mage.Sets/src/mage/cards/d/DwarvenNomad.java index 8d0b7c4e065..2ade059d20c 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenNomad.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenNomad.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java b/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java index 18b098f8737..9e6b572df3d 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenPony.java b/Mage.Sets/src/mage/cards/d/DwarvenPony.java index 259fc3e5c25..70b05cf42f2 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenPony.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenPony.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DwarvenRecruiter.java b/Mage.Sets/src/mage/cards/d/DwarvenRecruiter.java index d3d8aa5b508..d8b4514a27a 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenRecruiter.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenRecruiter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.RecruiterEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenRuins.java b/Mage.Sets/src/mage/cards/d/DwarvenRuins.java index 92081e999c5..2f727091644 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenRuins.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenRuins.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/d/DwarvenSoldier.java b/Mage.Sets/src/mage/cards/d/DwarvenSoldier.java index 8277b34a259..3a77f999ecd 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenSoldier.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenSoldier.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/d/DwarvenSong.java b/Mage.Sets/src/mage/cards/d/DwarvenSong.java index 33d8db13bdb..369680563f1 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenSong.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenSong.java @@ -28,17 +28,17 @@ package mage.cards.d; - import java.util.UUID; - - import mage.ObjectColor; - import mage.abilities.effects.Effect; - import mage.abilities.effects.common.continuous.BecomesColorTargetEffect; - import mage.cards.CardImpl; +import mage.ObjectColor; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.continuous.BecomesColorTargetEffect; +import mage.cards.CardImpl; import mage.cards.CardSetInfo; - import mage.constants.CardType; - import mage.constants.Duration; - import mage.filter.common.FilterCreaturePermanent; - import mage.target.common.TargetCreaturePermanent; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.filter.common.FilterCreaturePermanent; +import mage.target.common.TargetCreaturePermanent; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java b/Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java index d5f53c0001f..7facd050d8f 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenStrikeForce.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java b/Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java index 4dc68e668a7..03888b23fa7 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenThaumaturgist.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DwarvenTrader.java b/Mage.Sets/src/mage/cards/d/DwarvenTrader.java index cc75ac7c763..8a78cc50c98 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenTrader.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenTrader.java @@ -27,11 +27,12 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/d/DwarvenVigilantes.java b/Mage.Sets/src/mage/cards/d/DwarvenVigilantes.java index ad2d61fe829..d13756a96e2 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenVigilantes.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenVigilantes.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenWarriors.java b/Mage.Sets/src/mage/cards/d/DwarvenWarriors.java index 92b00a8fc6c..c49ef4f9186 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenWarriors.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenWarriors.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwarvenWeaponsmith.java b/Mage.Sets/src/mage/cards/d/DwarvenWeaponsmith.java index ed660a88374..84ea54a71d1 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenWeaponsmith.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenWeaponsmith.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.condition.common.IsStepCondition; @@ -45,6 +44,8 @@ import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DwellOnThePast.java b/Mage.Sets/src/mage/cards/d/DwellOnThePast.java index 0636f84d320..a7f1c1d3ad4 100644 --- a/Mage.Sets/src/mage/cards/d/DwellOnThePast.java +++ b/Mage.Sets/src/mage/cards/d/DwellOnThePast.java @@ -27,8 +27,6 @@ */ package mage.cards.d; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -43,6 +41,9 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCardInGraveyard; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java b/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java index a658cfd0ce3..52ab5181591 100644 --- a/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java +++ b/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,11 +38,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; +import java.util.UUID; + /** * * @author emerald000 @@ -57,7 +59,7 @@ public class DwynenGiltLeafDaen extends CardImpl { public DwynenGiltLeafDaen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/d/DwynensElite.java b/Mage.Sets/src/mage/cards/d/DwynensElite.java index aa0efde0f62..da554a34c58 100644 --- a/Mage.Sets/src/mage/cards/d/DwynensElite.java +++ b/Mage.Sets/src/mage/cards/d/DwynensElite.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.TriggeredAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.ElfToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/d/DyingWail.java b/Mage.Sets/src/mage/cards/d/DyingWail.java index c94c0868344..b0f4b1aac0f 100644 --- a/Mage.Sets/src/mage/cards/d/DyingWail.java +++ b/Mage.Sets/src/mage/cards/d/DyingWail.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,6 +40,8 @@ import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/d/DyingWish.java b/Mage.Sets/src/mage/cards/d/DyingWish.java index 998386217ca..628ced0274a 100644 --- a/Mage.Sets/src/mage/cards/d/DyingWish.java +++ b/Mage.Sets/src/mage/cards/d/DyingWish.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -47,6 +46,8 @@ import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/Dynacharge.java b/Mage.Sets/src/mage/cards/d/Dynacharge.java index 4941bfa6012..2f597dc90e6 100644 --- a/Mage.Sets/src/mage/cards/d/Dynacharge.java +++ b/Mage.Sets/src/mage/cards/d/Dynacharge.java @@ -27,17 +27,18 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/d/DynavoltTower.java b/Mage.Sets/src/mage/cards/d/DynavoltTower.java index cb58112965b..43c1acc2f7a 100644 --- a/Mage.Sets/src/mage/cards/d/DynavoltTower.java +++ b/Mage.Sets/src/mage/cards/d/DynavoltTower.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterInstantOrSorcerySpell; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/d/Dystopia.java b/Mage.Sets/src/mage/cards/d/Dystopia.java index 0117152fe2a..b1065fa1d3f 100644 --- a/Mage.Sets/src/mage/cards/d/Dystopia.java +++ b/Mage.Sets/src/mage/cards/d/Dystopia.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.PayLifeCost; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/EMPBlast.java b/Mage.Sets/src/mage/cards/e/EMPBlast.java index f2043de3211..83e1b36f4b2 100644 --- a/Mage.Sets/src/mage/cards/e/EMPBlast.java +++ b/Mage.Sets/src/mage/cards/e/EMPBlast.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/EagerCadet.java b/Mage.Sets/src/mage/cards/e/EagerCadet.java index ba46ca10aac..aab1fe80133 100644 --- a/Mage.Sets/src/mage/cards/e/EagerCadet.java +++ b/Mage.Sets/src/mage/cards/e/EagerCadet.java @@ -27,11 +27,12 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EagerConstruct.java b/Mage.Sets/src/mage/cards/e/EagerConstruct.java index 1638582ddfa..db335b10a22 100644 --- a/Mage.Sets/src/mage/cards/e/EagerConstruct.java +++ b/Mage.Sets/src/mage/cards/e/EagerConstruct.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EagleOfTheWatch.java b/Mage.Sets/src/mage/cards/e/EagleOfTheWatch.java index 4fa5dda8966..92e9c6c1cda 100644 --- a/Mage.Sets/src/mage/cards/e/EagleOfTheWatch.java +++ b/Mage.Sets/src/mage/cards/e/EagleOfTheWatch.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EarlyFrost.java b/Mage.Sets/src/mage/cards/e/EarlyFrost.java index 4c718a6e044..3ae7e97dea9 100644 --- a/Mage.Sets/src/mage/cards/e/EarlyFrost.java +++ b/Mage.Sets/src/mage/cards/e/EarlyFrost.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EarlyHarvest.java b/Mage.Sets/src/mage/cards/e/EarlyHarvest.java index a5d060b09be..1efd4abe365 100644 --- a/Mage.Sets/src/mage/cards/e/EarlyHarvest.java +++ b/Mage.Sets/src/mage/cards/e/EarlyHarvest.java @@ -27,13 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; @@ -41,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman @@ -69,7 +71,7 @@ class UntapAllLandsTargetEffect extends OneShotEffect { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public UntapAllLandsTargetEffect() { diff --git a/Mage.Sets/src/mage/cards/e/EarnestFellowship.java b/Mage.Sets/src/mage/cards/e/EarnestFellowship.java index 3f169001621..6217b885395 100644 --- a/Mage.Sets/src/mage/cards/e/EarnestFellowship.java +++ b/Mage.Sets/src/mage/cards/e/EarnestFellowship.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -37,12 +34,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -50,6 +42,10 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author cbt33, Loki (TakenoSamuraiGeneral), North (Coat of Arms) diff --git a/Mage.Sets/src/mage/cards/e/EarsplittingRats.java b/Mage.Sets/src/mage/cards/e/EarsplittingRats.java index 656be897c36..97ecc996127 100644 --- a/Mage.Sets/src/mage/cards/e/EarsplittingRats.java +++ b/Mage.Sets/src/mage/cards/e/EarsplittingRats.java @@ -27,19 +27,19 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; -import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.RegenerateSourceEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EarthElemental.java b/Mage.Sets/src/mage/cards/e/EarthElemental.java index fcb24749597..b97b64f3f95 100644 --- a/Mage.Sets/src/mage/cards/e/EarthElemental.java +++ b/Mage.Sets/src/mage/cards/e/EarthElemental.java @@ -28,11 +28,12 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EarthRift.java b/Mage.Sets/src/mage/cards/e/EarthRift.java index 4f6c0771be1..1fec6a7d83a 100644 --- a/Mage.Sets/src/mage/cards/e/EarthRift.java +++ b/Mage.Sets/src/mage/cards/e/EarthRift.java @@ -27,16 +27,17 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TimingRule; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EarthServant.java b/Mage.Sets/src/mage/cards/e/EarthServant.java index c014bde6e69..d76d184bd1e 100644 --- a/Mage.Sets/src/mage/cards/e/EarthServant.java +++ b/Mage.Sets/src/mage/cards/e/EarthServant.java @@ -28,21 +28,22 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com, North diff --git a/Mage.Sets/src/mage/cards/e/EarthSurge.java b/Mage.Sets/src/mage/cards/e/EarthSurge.java index c87c6be50a7..9fb0093f72a 100644 --- a/Mage.Sets/src/mage/cards/e/EarthSurge.java +++ b/Mage.Sets/src/mage/cards/e/EarthSurge.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/Earthbind.java b/Mage.Sets/src/mage/cards/e/Earthbind.java index 036131aae79..d264d2ba792 100644 --- a/Mage.Sets/src/mage/cards/e/Earthbind.java +++ b/Mage.Sets/src/mage/cards/e/Earthbind.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/e/Earthblighter.java b/Mage.Sets/src/mage/cards/e/Earthblighter.java index 8de56502885..21ae5600c8a 100644 --- a/Mage.Sets/src/mage/cards/e/Earthblighter.java +++ b/Mage.Sets/src/mage/cards/e/Earthblighter.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Earthbrawn.java b/Mage.Sets/src/mage/cards/e/Earthbrawn.java index 89849b71811..fb062365ca1 100644 --- a/Mage.Sets/src/mage/cards/e/Earthbrawn.java +++ b/Mage.Sets/src/mage/cards/e/Earthbrawn.java @@ -27,17 +27,17 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.ReinforceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/Earthcraft.java b/Mage.Sets/src/mage/cards/e/Earthcraft.java index b9bcce6efeb..08218e471f1 100644 --- a/Mage.Sets/src/mage/cards/e/Earthcraft.java +++ b/Mage.Sets/src/mage/cards/e/Earthcraft.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/e/EarthenArms.java b/Mage.Sets/src/mage/cards/e/EarthenArms.java index a148175f57c..eff0dc51e07 100644 --- a/Mage.Sets/src/mage/cards/e/EarthenArms.java +++ b/Mage.Sets/src/mage/cards/e/EarthenArms.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.AwakenAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Earthquake.java b/Mage.Sets/src/mage/cards/e/Earthquake.java index eac8135c8e5..faa1900456d 100644 --- a/Mage.Sets/src/mage/cards/e/Earthquake.java +++ b/Mage.Sets/src/mage/cards/e/Earthquake.java @@ -28,7 +28,6 @@ package mage.cards.e; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.keyword.FlyingAbility; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/Earthshaker.java b/Mage.Sets/src/mage/cards/e/Earthshaker.java index e180447dd04..b27479facd0 100644 --- a/Mage.Sets/src/mage/cards/e/Earthshaker.java +++ b/Mage.Sets/src/mage/cards/e/Earthshaker.java @@ -28,9 +28,6 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; @@ -38,11 +35,14 @@ import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/e/EarwigSquad.java b/Mage.Sets/src/mage/cards/e/EarwigSquad.java index 9eee178d314..e0bca80d757 100644 --- a/Mage.Sets/src/mage/cards/e/EarwigSquad.java +++ b/Mage.Sets/src/mage/cards/e/EarwigSquad.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -48,6 +46,9 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetOpponent; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EasternPaladin.java b/Mage.Sets/src/mage/cards/e/EasternPaladin.java index 83e846ee5d3..703f4dfa27e 100644 --- a/Mage.Sets/src/mage/cards/e/EasternPaladin.java +++ b/Mage.Sets/src/mage/cards/e/EasternPaladin.java @@ -29,9 +29,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,10 +38,14 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/e/EaterOfDays.java b/Mage.Sets/src/mage/cards/e/EaterOfDays.java index 209e959ae6d..959f5f5eed9 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfDays.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfDays.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.turn.SkipNextTurnSourceEffect; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EaterOfHope.java b/Mage.Sets/src/mage/cards/e/EaterOfHope.java index 0ffda527554..542c8595d02 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfHope.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfHope.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/EaterOfTheDead.java b/Mage.Sets/src/mage/cards/e/EaterOfTheDead.java index 16be4c40756..a19b90647f6 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfTheDead.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfTheDead.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EbonDragon.java b/Mage.Sets/src/mage/cards/e/EbonDragon.java index fe0a05c4b55..acfa918805b 100644 --- a/Mage.Sets/src/mage/cards/e/EbonDragon.java +++ b/Mage.Sets/src/mage/cards/e/EbonDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EbonDrake.java b/Mage.Sets/src/mage/cards/e/EbonDrake.java index 8005852b4a3..82c1dc1787a 100644 --- a/Mage.Sets/src/mage/cards/e/EbonDrake.java +++ b/Mage.Sets/src/mage/cards/e/EbonDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EbonPraetor.java b/Mage.Sets/src/mage/cards/e/EbonPraetor.java index 380093fd8a3..ddf43a9bab0 100644 --- a/Mage.Sets/src/mage/cards/e/EbonPraetor.java +++ b/Mage.Sets/src/mage/cards/e/EbonPraetor.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,17 +41,15 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EbonStronghold.java b/Mage.Sets/src/mage/cards/e/EbonStronghold.java index a4cf39efea2..397143ad280 100644 --- a/Mage.Sets/src/mage/cards/e/EbonStronghold.java +++ b/Mage.Sets/src/mage/cards/e/EbonStronghold.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java b/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java index 73e52f21dbd..a875806cf95 100644 --- a/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java +++ b/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author BijanT diff --git a/Mage.Sets/src/mage/cards/e/EbonyCharm.java b/Mage.Sets/src/mage/cards/e/EbonyCharm.java index 53a4318d601..aab766aacea 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyCharm.java +++ b/Mage.Sets/src/mage/cards/e/EbonyCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.target.common.TargetCardInASingleGraveyard; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EbonyHorse.java b/Mage.Sets/src/mage/cards/e/EbonyHorse.java index 054d6b33839..3ec2929ca99 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyHorse.java +++ b/Mage.Sets/src/mage/cards/e/EbonyHorse.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -48,6 +46,8 @@ import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/e/EbonyOwlNetsuke.java b/Mage.Sets/src/mage/cards/e/EbonyOwlNetsuke.java index 73b1c83dde8..ad640af50e5 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyOwlNetsuke.java +++ b/Mage.Sets/src/mage/cards/e/EbonyOwlNetsuke.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/EbonyRhino.java b/Mage.Sets/src/mage/cards/e/EbonyRhino.java index 3c75b65dd82..6ef793d7775 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyRhino.java +++ b/Mage.Sets/src/mage/cards/e/EbonyRhino.java @@ -27,12 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java b/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java index 5028eddb620..1936f610948 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java +++ b/Mage.Sets/src/mage/cards/e/EbonyTreefolk.java @@ -27,18 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java index 835979e482e..7864d006718 100644 --- a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java +++ b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -36,13 +35,7 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityType; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -52,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/EchoCirclet.java b/Mage.Sets/src/mage/cards/e/EchoCirclet.java index f8dada29e11..5f9f43ababd 100644 --- a/Mage.Sets/src/mage/cards/e/EchoCirclet.java +++ b/Mage.Sets/src/mage/cards/e/EchoCirclet.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -37,9 +34,12 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author nantuko diff --git a/Mage.Sets/src/mage/cards/e/EchoTracer.java b/Mage.Sets/src/mage/cards/e/EchoTracer.java index ae79af8cfb6..a73a7a13793 100644 --- a/Mage.Sets/src/mage/cards/e/EchoTracer.java +++ b/Mage.Sets/src/mage/cards/e/EchoTracer.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java b/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java index c0673833a64..c1dc6f4ae1c 100644 --- a/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java +++ b/Mage.Sets/src/mage/cards/e/EchoesOfTheKinTree.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.keyword.BolsterEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EchoingCalm.java b/Mage.Sets/src/mage/cards/e/EchoingCalm.java index 4463e071ce2..201aded9f77 100644 --- a/Mage.Sets/src/mage/cards/e/EchoingCalm.java +++ b/Mage.Sets/src/mage/cards/e/EchoingCalm.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/e/EchoingCourage.java b/Mage.Sets/src/mage/cards/e/EchoingCourage.java index 923132d7e7d..4311840be3e 100644 --- a/Mage.Sets/src/mage/cards/e/EchoingCourage.java +++ b/Mage.Sets/src/mage/cards/e/EchoingCourage.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EchoingDecay.java b/Mage.Sets/src/mage/cards/e/EchoingDecay.java index 87b1a5f60e6..38786a6c5a8 100644 --- a/Mage.Sets/src/mage/cards/e/EchoingDecay.java +++ b/Mage.Sets/src/mage/cards/e/EchoingDecay.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EchoingRuin.java b/Mage.Sets/src/mage/cards/e/EchoingRuin.java index dbcefee6bb5..977992b0b88 100644 --- a/Mage.Sets/src/mage/cards/e/EchoingRuin.java +++ b/Mage.Sets/src/mage/cards/e/EchoingRuin.java @@ -27,13 +27,12 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; -import mage.constants.Outcome; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EchoingTruth.java b/Mage.Sets/src/mage/cards/e/EchoingTruth.java index 46659bc02ab..db7bc37d973 100644 --- a/Mage.Sets/src/mage/cards/e/EchoingTruth.java +++ b/Mage.Sets/src/mage/cards/e/EchoingTruth.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EddytrailHawk.java b/Mage.Sets/src/mage/cards/e/EddytrailHawk.java index 633b6a47fe7..769b6c8cb50 100644 --- a/Mage.Sets/src/mage/cards/e/EddytrailHawk.java +++ b/Mage.Sets/src/mage/cards/e/EddytrailHawk.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EdgeOfAutumn.java b/Mage.Sets/src/mage/cards/e/EdgeOfAutumn.java index 9545a6fbd4c..df800455651 100644 --- a/Mage.Sets/src/mage/cards/e/EdgeOfAutumn.java +++ b/Mage.Sets/src/mage/cards/e/EdgeOfAutumn.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -44,6 +42,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java b/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java index 70648ddc75e..7660be222b5 100644 --- a/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java +++ b/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -36,14 +35,16 @@ import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; -import mage.constants.CardType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/Edgewalker.java b/Mage.Sets/src/mage/cards/e/Edgewalker.java index a38562e0de3..6f75f9300d8 100644 --- a/Mage.Sets/src/mage/cards/e/Edgewalker.java +++ b/Mage.Sets/src/mage/cards/e/Edgewalker.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EdricSpymasterOfTrest.java b/Mage.Sets/src/mage/cards/e/EdricSpymasterOfTrest.java index f90123eeca9..72d5e522165 100644 --- a/Mage.Sets/src/mage/cards/e/EdricSpymasterOfTrest.java +++ b/Mage.Sets/src/mage/cards/e/EdricSpymasterOfTrest.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -42,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author mluds */ @@ -49,7 +51,7 @@ public class EdricSpymasterOfTrest extends CardImpl { public EdricSpymasterOfTrest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/cards/e/EelUmbra.java b/Mage.Sets/src/mage/cards/e/EelUmbra.java index 2e9ae865d09..62985123b26 100644 --- a/Mage.Sets/src/mage/cards/e/EelUmbra.java +++ b/Mage.Sets/src/mage/cards/e/EelUmbra.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -39,9 +36,15 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.TotemArmorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EerieInterlude.java b/Mage.Sets/src/mage/cards/e/EerieInterlude.java index 2d5c954b8ac..d2038b76bd3 100644 --- a/Mage.Sets/src/mage/cards/e/EerieInterlude.java +++ b/Mage.Sets/src/mage/cards/e/EerieInterlude.java @@ -27,21 +27,13 @@ */ package mage.cards.e; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.cards.CardSetInfo; -import mage.cards.MeldCard; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; @@ -54,6 +46,10 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTargets; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EerieProcession.java b/Mage.Sets/src/mage/cards/e/EerieProcession.java index 112c58fb1ea..3bfe1a00d9e 100644 --- a/Mage.Sets/src/mage/cards/e/EerieProcession.java +++ b/Mage.Sets/src/mage/cards/e/EerieProcession.java @@ -28,16 +28,16 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/e/EfficientConstruction.java b/Mage.Sets/src/mage/cards/e/EfficientConstruction.java index fd2e6addb8f..878870fffa5 100644 --- a/Mage.Sets/src/mage/cards/e/EfficientConstruction.java +++ b/Mage.Sets/src/mage/cards/e/EfficientConstruction.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactSpell; import mage.game.permanent.token.ThopterColorlessToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java index 3a70cbf7aaf..248c772ed38 100644 --- a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java +++ b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java @@ -27,12 +27,11 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -47,6 +46,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EgoErasure.java b/Mage.Sets/src/mage/cards/e/EgoErasure.java index 0d204ba173b..65870c0fc12 100644 --- a/Mage.Sets/src/mage/cards/e/EgoErasure.java +++ b/Mage.Sets/src/mage/cards/e/EgoErasure.java @@ -28,9 +28,6 @@ package mage.cards.e; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; @@ -38,16 +35,16 @@ import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.repository.CardRepository; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPlayer; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfBlossoms.java b/Mage.Sets/src/mage/cards/e/EidolonOfBlossoms.java index 02909b58557..21aae5d88b8 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfBlossoms.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfBlossoms.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.ConstellationAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java b/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java index b64b3d10d63..a4364612f0f 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java b/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java index 1feb781aeca..f9f475a6664 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.CantCastMoreThanOneSpellEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfTheGreatRevel.java b/Mage.Sets/src/mage/cards/e/EidolonOfTheGreatRevel.java index ebaa4404a82..37b0413a01c 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfTheGreatRevel.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfTheGreatRevel.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -42,6 +41,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EiganjoCastle.java b/Mage.Sets/src/mage/cards/e/EiganjoCastle.java index d48ef704de7..1164c4c2532 100644 --- a/Mage.Sets/src/mage/cards/e/EiganjoCastle.java +++ b/Mage.Sets/src/mage/cards/e/EiganjoCastle.java @@ -28,9 +28,6 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,10 +36,13 @@ import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ @@ -51,12 +51,12 @@ public class EiganjoCastle extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public EiganjoCastle(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.addAbility(new WhiteManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EiganjoFreeRiders.java b/Mage.Sets/src/mage/cards/e/EiganjoFreeRiders.java index 99d5ca49012..d6b98182f6e 100644 --- a/Mage.Sets/src/mage/cards/e/EiganjoFreeRiders.java +++ b/Mage.Sets/src/mage/cards/e/EiganjoFreeRiders.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java b/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java index 1806dba5188..5061fcac694 100644 --- a/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java +++ b/Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java @@ -27,24 +27,26 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.BecomesColorTargetEffect; +import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetSpellOrPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class EightAndAHalfTails extends CardImpl { public EightAndAHalfTails(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Fox"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/e/EkunduGriffin.java b/Mage.Sets/src/mage/cards/e/EkunduGriffin.java index 681fe4da32f..d07390d7a60 100644 --- a/Mage.Sets/src/mage/cards/e/EkunduGriffin.java +++ b/Mage.Sets/src/mage/cards/e/EkunduGriffin.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ElHajjaj.java b/Mage.Sets/src/mage/cards/e/ElHajjaj.java index 6e7a394179a..b8c30414481 100644 --- a/Mage.Sets/src/mage/cards/e/ElHajjaj.java +++ b/Mage.Sets/src/mage/cards/e/ElHajjaj.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageGainLifeSourceTriggeredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java b/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java index a9168df1cd1..feeb309a190 100644 --- a/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java +++ b/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -37,12 +34,16 @@ import mage.abilities.keyword.ForestwalkAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Loki @@ -59,7 +60,7 @@ public class EladamriLordOfLeaves extends CardImpl { public EladamriLordOfLeaves(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/e/EladamrisCall.java b/Mage.Sets/src/mage/cards/e/EladamrisCall.java index 99be6ab6d26..a8d16a5f059 100644 --- a/Mage.Sets/src/mage/cards/e/EladamrisCall.java +++ b/Mage.Sets/src/mage/cards/e/EladamrisCall.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EladamrisVineyard.java b/Mage.Sets/src/mage/cards/e/EladamrisVineyard.java index eed8be1e3c4..ce87d3a4dec 100644 --- a/Mage.Sets/src/mage/cards/e/EladamrisVineyard.java +++ b/Mage.Sets/src/mage/cards/e/EladamrisVineyard.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - import mage.Mana; import mage.abilities.common.BeginningOfPreCombatMainTriggeredAbility; import mage.abilities.effects.common.AddManaToManaPoolTargetControllerEffect; @@ -38,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElandUmbra.java b/Mage.Sets/src/mage/cards/e/ElandUmbra.java index eb149953254..f819d535c44 100644 --- a/Mage.Sets/src/mage/cards/e/ElandUmbra.java +++ b/Mage.Sets/src/mage/cards/e/ElandUmbra.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -38,9 +35,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TotemArmorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java b/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java index 34d5f2efd95..e18fac014ff 100644 --- a/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java +++ b/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,14 +35,18 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.TransformAbility; -import mage.cards.w.WithengarUnbound; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.w.WithengarUnbound; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author BetaSteward @@ -54,7 +55,7 @@ public class ElbrusTheBindingBlade extends CardImpl { public ElbrusTheBindingBlade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{7}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); this.transformable = true; diff --git a/Mage.Sets/src/mage/cards/e/ElderCathar.java b/Mage.Sets/src/mage/cards/e/ElderCathar.java index 65045ba6936..497a8165b70 100644 --- a/Mage.Sets/src/mage/cards/e/ElderCathar.java +++ b/Mage.Sets/src/mage/cards/e/ElderCathar.java @@ -27,13 +27,13 @@ */ package mage.cards.e; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.Counter; import mage.counters.CounterType; diff --git a/Mage.Sets/src/mage/cards/e/ElderDeepFiend.java b/Mage.Sets/src/mage/cards/e/ElderDeepFiend.java index 0bdd0b562a2..7000297ee41 100644 --- a/Mage.Sets/src/mage/cards/e/ElderDeepFiend.java +++ b/Mage.Sets/src/mage/cards/e/ElderDeepFiend.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/ElderDruid.java b/Mage.Sets/src/mage/cards/e/ElderDruid.java index 8704e3c8c61..7725aa4b21e 100644 --- a/Mage.Sets/src/mage/cards/e/ElderDruid.java +++ b/Mage.Sets/src/mage/cards/e/ElderDruid.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/ElderMastery.java b/Mage.Sets/src/mage/cards/e/ElderMastery.java index 5b5e8bb664f..06baad0349d 100644 --- a/Mage.Sets/src/mage/cards/e/ElderMastery.java +++ b/Mage.Sets/src/mage/cards/e/ElderMastery.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElderOfLaurels.java b/Mage.Sets/src/mage/cards/e/ElderOfLaurels.java index 9c5a57bfd66..d1b1c71ebac 100644 --- a/Mage.Sets/src/mage/cards/e/ElderOfLaurels.java +++ b/Mage.Sets/src/mage/cards/e/ElderOfLaurels.java @@ -27,10 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,9 +34,14 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ElderPineOfJukai.java b/Mage.Sets/src/mage/cards/e/ElderPineOfJukai.java index e3876ccfad5..dfe2d34a164 100644 --- a/Mage.Sets/src/mage/cards/e/ElderPineOfJukai.java +++ b/Mage.Sets/src/mage/cards/e/ElderPineOfJukai.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterSpiritOrArcaneCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java b/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java index e1e4d4eb6d5..361437d284b 100644 --- a/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java +++ b/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,10 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/e/ElderwoodScion.java b/Mage.Sets/src/mage/cards/e/ElderwoodScion.java index 7dd1bd42317..30a348f510e 100644 --- a/Mage.Sets/src/mage/cards/e/ElderwoodScion.java +++ b/Mage.Sets/src/mage/cards/e/ElderwoodScion.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,15 +38,13 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.target.Target; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java index 7c4edd78a9f..0c27e3c931b 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java +++ b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EldraziConscription.java b/Mage.Sets/src/mage/cards/e/EldraziConscription.java index b2d0b2a02dd..3425b9a67f0 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziConscription.java +++ b/Mage.Sets/src/mage/cards/e/EldraziConscription.java @@ -28,11 +28,6 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -44,11 +39,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.Outcome; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EldraziDevastator.java b/Mage.Sets/src/mage/cards/e/EldraziDevastator.java index a1f6ed53ffa..45e6daa6f2b 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziDevastator.java +++ b/Mage.Sets/src/mage/cards/e/EldraziDevastator.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java b/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java index 4bc25802a48..8b5c51b9b8f 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java +++ b/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EldraziMimic.java b/Mage.Sets/src/mage/cards/e/EldraziMimic.java index 19d9f8cb4c0..7350e4c609d 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziMimic.java +++ b/Mage.Sets/src/mage/cards/e/EldraziMimic.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -36,11 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.SetPowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -49,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EldraziMonument.java b/Mage.Sets/src/mage/cards/e/EldraziMonument.java index 50c3b423ea2..60868c105a8 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziMonument.java +++ b/Mage.Sets/src/mage/cards/e/EldraziMonument.java @@ -28,11 +28,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +40,10 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -54,6 +53,8 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/EldraziObligator.java b/Mage.Sets/src/mage/cards/e/EldraziObligator.java index 973efb0c107..db693a772ee 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziObligator.java +++ b/Mage.Sets/src/mage/cards/e/EldraziObligator.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; @@ -47,6 +46,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EldraziSkyspawner.java b/Mage.Sets/src/mage/cards/e/EldraziSkyspawner.java index cd63ed45807..5df6806cb00 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziSkyspawner.java +++ b/Mage.Sets/src/mage/cards/e/EldraziSkyspawner.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.EldraziScionToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EldraziTemple.java b/Mage.Sets/src/mage/cards/e/EldraziTemple.java index 338358dddcd..e004631e49e 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziTemple.java +++ b/Mage.Sets/src/mage/cards/e/EldraziTemple.java @@ -27,10 +27,7 @@ */ package mage.cards.e; -import java.util.UUID; - import mage.ConditionalMana; -import mage.constants.CardType; import mage.MageObject; import mage.Mana; import mage.abilities.Ability; @@ -41,8 +38,11 @@ import mage.abilities.mana.ConditionalColorlessManaAbility; import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.Game; +import java.util.UUID; + /** * * @author Loki, nantuko diff --git a/Mage.Sets/src/mage/cards/e/EldritchEvolution.java b/Mage.Sets/src/mage/cards/e/EldritchEvolution.java index b78f3cda7f4..c4c4db12579 100644 --- a/Mage.Sets/src/mage/cards/e/EldritchEvolution.java +++ b/Mage.Sets/src/mage/cards/e/EldritchEvolution.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; @@ -50,6 +49,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ElectricEel.java b/Mage.Sets/src/mage/cards/e/ElectricEel.java index 0e87a4e875c..4e2ddd2ff88 100644 --- a/Mage.Sets/src/mage/cards/e/ElectricEel.java +++ b/Mage.Sets/src/mage/cards/e/ElectricEel.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Electrickery.java b/Mage.Sets/src/mage/cards/e/Electrickery.java index 344b31a8c62..cba3a26c1db 100644 --- a/Mage.Sets/src/mage/cards/e/Electrickery.java +++ b/Mage.Sets/src/mage/cards/e/Electrickery.java @@ -27,20 +27,20 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.OverloadAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Electrolyze.java b/Mage.Sets/src/mage/cards/e/Electrolyze.java index 8aaf29be936..8b92785ee4d 100644 --- a/Mage.Sets/src/mage/cards/e/Electrolyze.java +++ b/Mage.Sets/src/mage/cards/e/Electrolyze.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/e/Electropotence.java b/Mage.Sets/src/mage/cards/e/Electropotence.java index e18c15f9169..e560e4b6215 100644 --- a/Mage.Sets/src/mage/cards/e/Electropotence.java +++ b/Mage.Sets/src/mage/cards/e/Electropotence.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCosts; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ElectrostaticBolt.java b/Mage.Sets/src/mage/cards/e/ElectrostaticBolt.java index b5fa7d4a36f..afffdb0277d 100644 --- a/Mage.Sets/src/mage/cards/e/ElectrostaticBolt.java +++ b/Mage.Sets/src/mage/cards/e/ElectrostaticBolt.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ElectrostaticPummeler.java b/Mage.Sets/src/mage/cards/e/ElectrostaticPummeler.java index 7e2d861bc7c..b000630c836 100644 --- a/Mage.Sets/src/mage/cards/e/ElectrostaticPummeler.java +++ b/Mage.Sets/src/mage/cards/e/ElectrostaticPummeler.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/ElegantEdgecrafters.java b/Mage.Sets/src/mage/cards/e/ElegantEdgecrafters.java index 9d5a47c09b8..6296ed36084 100644 --- a/Mage.Sets/src/mage/cards/e/ElegantEdgecrafters.java +++ b/Mage.Sets/src/mage/cards/e/ElegantEdgecrafters.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -40,6 +39,8 @@ import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElementalAppeal.java b/Mage.Sets/src/mage/cards/e/ElementalAppeal.java index 3313e9e046b..5fe76f43ad1 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalAppeal.java +++ b/Mage.Sets/src/mage/cards/e/ElementalAppeal.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.condition.LockedInCondition; @@ -47,6 +46,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ElementalAugury.java b/Mage.Sets/src/mage/cards/e/ElementalAugury.java index 4ada3537c12..d5f72f21695 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalAugury.java +++ b/Mage.Sets/src/mage/cards/e/ElementalAugury.java @@ -27,16 +27,11 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -44,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElementalBond.java b/Mage.Sets/src/mage/cards/e/ElementalBond.java index c16756181a7..45cb5b36371 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalBond.java +++ b/Mage.Sets/src/mage/cards/e/ElementalBond.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/ElementalMastery.java b/Mage.Sets/src/mage/cards/e/ElementalMastery.java index 914b39854e1..c10e74f8bbc 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalMastery.java +++ b/Mage.Sets/src/mage/cards/e/ElementalMastery.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -51,6 +50,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/ElementalUprising.java b/Mage.Sets/src/mage/cards/e/ElementalUprising.java index 926f8ac93e6..6af935f2c98 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalUprising.java +++ b/Mage.Sets/src/mage/cards/e/ElementalUprising.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.MustBeBlockedByAtLeastOneTargetEffect; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElephantAmbush.java b/Mage.Sets/src/mage/cards/e/ElephantAmbush.java index 9f9eaad7d41..7921766b763 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantAmbush.java +++ b/Mage.Sets/src/mage/cards/e/ElephantAmbush.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.game.permanent.token.ElephantToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElephantGrass.java b/Mage.Sets/src/mage/cards/e/ElephantGrass.java index 2f57f5b75f9..a91a123d297 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGrass.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGrass.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElephantGraveyard.java b/Mage.Sets/src/mage/cards/e/ElephantGraveyard.java index d3d24c71317..c7f4add9b33 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGraveyard.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGraveyard.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/e/ElephantGuide.java b/Mage.Sets/src/mage/cards/e/ElephantGuide.java index 13c09d0df0c..e33f82008ca 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGuide.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.token.ElephantToken; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java b/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java index 470abe02176..d007b3c7f53 100644 --- a/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java +++ b/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java @@ -28,9 +28,6 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -38,9 +35,13 @@ import mage.abilities.effects.common.continuous.BoostOpponentsEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +50,7 @@ public class EleshNornGrandCenobite extends CardImpl { public EleshNornGrandCenobite (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Praetor"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/e/ElfReplica.java b/Mage.Sets/src/mage/cards/e/ElfReplica.java index 87a8ae9c70e..f4368512198 100644 --- a/Mage.Sets/src/mage/cards/e/ElfReplica.java +++ b/Mage.Sets/src/mage/cards/e/ElfReplica.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElfhamePalace.java b/Mage.Sets/src/mage/cards/e/ElfhamePalace.java index 545b20fd456..e2242e1a8d2 100644 --- a/Mage.Sets/src/mage/cards/e/ElfhamePalace.java +++ b/Mage.Sets/src/mage/cards/e/ElfhamePalace.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ElfhameSanctuary.java b/Mage.Sets/src/mage/cards/e/ElfhameSanctuary.java index 5759660efc9..e94751e215f 100644 --- a/Mage.Sets/src/mage/cards/e/ElfhameSanctuary.java +++ b/Mage.Sets/src/mage/cards/e/ElfhameSanctuary.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Markedagain diff --git a/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java b/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java index 531ff5d6ebd..2ee35b05640 100644 --- a/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java +++ b/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java @@ -27,16 +27,17 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java b/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java index b7ab4757a16..9adc1b83a44 100644 --- a/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java +++ b/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/e/EliminateTheCompetition.java b/Mage.Sets/src/mage/cards/e/EliminateTheCompetition.java index 03bee79302c..63cbb0e93f6 100644 --- a/Mage.Sets/src/mage/cards/e/EliminateTheCompetition.java +++ b/Mage.Sets/src/mage/cards/e/EliminateTheCompetition.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeXTargetCost; import mage.abilities.dynamicvalue.common.GetXValue; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EliteArcanist.java b/Mage.Sets/src/mage/cards/e/EliteArcanist.java index c3f3d5816e6..4220623d9e7 100644 --- a/Mage.Sets/src/mage/cards/e/EliteArcanist.java +++ b/Mage.Sets/src/mage/cards/e/EliteArcanist.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EliteArchers.java b/Mage.Sets/src/mage/cards/e/EliteArchers.java index 50f4931f837..c810bead9a5 100644 --- a/Mage.Sets/src/mage/cards/e/EliteArchers.java +++ b/Mage.Sets/src/mage/cards/e/EliteArchers.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +34,12 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EliteCatWarrior.java b/Mage.Sets/src/mage/cards/e/EliteCatWarrior.java index c373c2051de..1bd14f65168 100644 --- a/Mage.Sets/src/mage/cards/e/EliteCatWarrior.java +++ b/Mage.Sets/src/mage/cards/e/EliteCatWarrior.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EliteInquisitor.java b/Mage.Sets/src/mage/cards/e/EliteInquisitor.java index 79faf7a26ee..1af223c28a4 100644 --- a/Mage.Sets/src/mage/cards/e/EliteInquisitor.java +++ b/Mage.Sets/src/mage/cards/e/EliteInquisitor.java @@ -27,19 +27,19 @@ */ package mage.cards.e; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; -import mage.filter.predicate.Predicates; /** * @author nantuko diff --git a/Mage.Sets/src/mage/cards/e/EliteJavelineer.java b/Mage.Sets/src/mage/cards/e/EliteJavelineer.java index 39f7e8d208d..479c0fb4fde 100644 --- a/Mage.Sets/src/mage/cards/e/EliteJavelineer.java +++ b/Mage.Sets/src/mage/cards/e/EliteJavelineer.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterAttackingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EliteScaleguard.java b/Mage.Sets/src/mage/cards/e/EliteScaleguard.java index 4f267b0967a..19d66bc4b7e 100644 --- a/Mage.Sets/src/mage/cards/e/EliteScaleguard.java +++ b/Mage.Sets/src/mage/cards/e/EliteScaleguard.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/EliteSkirmisher.java b/Mage.Sets/src/mage/cards/e/EliteSkirmisher.java index 82f7322b738..57a468a509e 100644 --- a/Mage.Sets/src/mage/cards/e/EliteSkirmisher.java +++ b/Mage.Sets/src/mage/cards/e/EliteSkirmisher.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.TapTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EliteVanguard.java b/Mage.Sets/src/mage/cards/e/EliteVanguard.java index 9c16d051137..a1fafd46d0c 100644 --- a/Mage.Sets/src/mage/cards/e/EliteVanguard.java +++ b/Mage.Sets/src/mage/cards/e/EliteVanguard.java @@ -28,11 +28,12 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java b/Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java index c34d0d7432c..c7a8e9c8f83 100644 --- a/Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java +++ b/Mage.Sets/src/mage/cards/e/ElixirOfImmortality.java @@ -28,10 +28,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,10 +36,15 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java b/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java index 92e4f294c12..3a358becc32 100644 --- a/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java +++ b/Mage.Sets/src/mage/cards/e/ElixirOfVitality.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Derpthemeus diff --git a/Mage.Sets/src/mage/cards/e/ElsewhereFlask.java b/Mage.Sets/src/mage/cards/e/ElsewhereFlask.java index ee4638f8cdb..55151ce5838 100644 --- a/Mage.Sets/src/mage/cards/e/ElsewhereFlask.java +++ b/Mage.Sets/src/mage/cards/e/ElsewhereFlask.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.Iterator; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,27 +35,21 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.mana.BlackManaAbility; -import mage.abilities.mana.BlueManaAbility; -import mage.abilities.mana.GreenManaAbility; -import mage.abilities.mana.RedManaAbility; -import mage.abilities.mana.WhiteManaAbility; +import mage.abilities.mana.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceBasicLandType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.Iterator; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java b/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java index 2fc1cf28108..60485658da2 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.abilities.common.SimpleStaticAbility; @@ -53,6 +52,8 @@ import mage.game.permanent.token.SoldierToken; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/ElspethSunsChampion.java b/Mage.Sets/src/mage/cards/e/ElspethSunsChampion.java index b6c4e56f8d0..c384c7d6ddc 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethSunsChampion.java +++ b/Mage.Sets/src/mage/cards/e/ElspethSunsChampion.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -49,6 +48,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.game.command.Emblem; import mage.game.permanent.token.SoldierToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElspethTirel.java b/Mage.Sets/src/mage/cards/e/ElspethTirel.java index 1afc3ed89a5..64ab4d54b6e 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethTirel.java +++ b/Mage.Sets/src/mage/cards/e/ElspethTirel.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -44,6 +43,8 @@ import mage.game.permanent.PermanentToken; import mage.game.permanent.token.SoldierToken; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElusiveKrasis.java b/Mage.Sets/src/mage/cards/e/ElusiveKrasis.java index b803be33268..6ec978f41cc 100644 --- a/Mage.Sets/src/mage/cards/e/ElusiveKrasis.java +++ b/Mage.Sets/src/mage/cards/e/ElusiveKrasis.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.CantBeBlockedSourceAbility; +import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ElusiveSpellfist.java b/Mage.Sets/src/mage/cards/e/ElusiveSpellfist.java index 37e811382c4..a43211edf07 100644 --- a/Mage.Sets/src/mage/cards/e/ElusiveSpellfist.java +++ b/Mage.Sets/src/mage/cards/e/ElusiveSpellfist.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ElusiveTormentor.java b/Mage.Sets/src/mage/cards/e/ElusiveTormentor.java index 48941660329..58573bd5cfc 100644 --- a/Mage.Sets/src/mage/cards/e/ElusiveTormentor.java +++ b/Mage.Sets/src/mage/cards/e/ElusiveTormentor.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -35,12 +34,14 @@ import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.i.InsidiousMist; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.i.InsidiousMist; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ElvenCache.java b/Mage.Sets/src/mage/cards/e/ElvenCache.java index 5733359f6d5..f983524c216 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenCache.java +++ b/Mage.Sets/src/mage/cards/e/ElvenCache.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/e/ElvenFortress.java b/Mage.Sets/src/mage/cards/e/ElvenFortress.java index 5ced9c4c3cb..dbe25ae7afc 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenFortress.java +++ b/Mage.Sets/src/mage/cards/e/ElvenFortress.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ElvenLyre.java b/Mage.Sets/src/mage/cards/e/ElvenLyre.java index b4aa6189f36..235ae92b0b5 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenLyre.java +++ b/Mage.Sets/src/mage/cards/e/ElvenLyre.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ElvenRiders.java b/Mage.Sets/src/mage/cards/e/ElvenRiders.java index 6d50e51c15d..05a87e62ffd 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenRiders.java +++ b/Mage.Sets/src/mage/cards/e/ElvenRiders.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/ElvenRite.java b/Mage.Sets/src/mage/cards/e/ElvenRite.java index de5b3f16300..16376a83faa 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenRite.java +++ b/Mage.Sets/src/mage/cards/e/ElvenRite.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.counter.DistributeCountersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ElvenWarhounds.java b/Mage.Sets/src/mage/cards/e/ElvenWarhounds.java index 681c20b6870..f8d94d9c502 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenWarhounds.java +++ b/Mage.Sets/src/mage/cards/e/ElvenWarhounds.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; import mage.abilities.effects.Effect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvesOfDeepShadow.java b/Mage.Sets/src/mage/cards/e/ElvesOfDeepShadow.java index b88e9c371d9..a20c08039af 100644 --- a/Mage.Sets/src/mage/cards/e/ElvesOfDeepShadow.java +++ b/Mage.Sets/src/mage/cards/e/ElvesOfDeepShadow.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -38,8 +35,11 @@ import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElvishAberration.java b/Mage.Sets/src/mage/cards/e/ElvishAberration.java index 145852f98ff..74672be12c1 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishAberration.java +++ b/Mage.Sets/src/mage/cards/e/ElvishAberration.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; @@ -38,8 +35,11 @@ import mage.abilities.keyword.ForestcyclingAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvishArchdruid.java b/Mage.Sets/src/mage/cards/e/ElvishArchdruid.java index adf06b6a360..4dc8557ce1f 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishArchdruid.java +++ b/Mage.Sets/src/mage/cards/e/ElvishArchdruid.java @@ -28,10 +28,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.common.SimpleStaticAbility; @@ -40,10 +36,15 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com, North diff --git a/Mage.Sets/src/mage/cards/e/ElvishArchers.java b/Mage.Sets/src/mage/cards/e/ElvishArchers.java index 261ac4ada3f..2b6e3b0107c 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishArchers.java +++ b/Mage.Sets/src/mage/cards/e/ElvishArchers.java @@ -27,12 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ElvishBard.java b/Mage.Sets/src/mage/cards/e/ElvishBard.java index a50fa4c52b6..bf572799bed 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBard.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBard.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.MustBeBlockedByAllSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvishBerserker.java b/Mage.Sets/src/mage/cards/e/ElvishBerserker.java index 6e62ec3d4f4..4453971b69a 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBerserker.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBerserker.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java index 917b6a009de..7399baac165 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/ElvishChampion.java b/Mage.Sets/src/mage/cards/e/ElvishChampion.java index 1508dc6324c..a35f9069c0a 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishChampion.java +++ b/Mage.Sets/src/mage/cards/e/ElvishChampion.java @@ -27,10 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -38,9 +34,14 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java index 9089626d2ea..6a9bdbaa63c 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -35,6 +34,7 @@ import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/cards/e/ElvishFarmer.java b/Mage.Sets/src/mage/cards/e/ElvishFarmer.java index d18ee4fe538..aa0f24877e9 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishFarmer.java +++ b/Mage.Sets/src/mage/cards/e/ElvishFarmer.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ElvishFury.java b/Mage.Sets/src/mage/cards/e/ElvishFury.java index 82f834718fa..b2e39a48982 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishFury.java +++ b/Mage.Sets/src/mage/cards/e/ElvishFury.java @@ -27,15 +27,16 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElvishGuidance.java b/Mage.Sets/src/mage/cards/e/ElvishGuidance.java index 9fbbbd13a4a..847686aa3cf 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishGuidance.java +++ b/Mage.Sets/src/mage/cards/e/ElvishGuidance.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Eirkei diff --git a/Mage.Sets/src/mage/cards/e/ElvishHandservant.java b/Mage.Sets/src/mage/cards/e/ElvishHandservant.java index 091520dbc68..a133d37a1d5 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHandservant.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHandservant.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElvishHarbinger.java b/Mage.Sets/src/mage/cards/e/ElvishHarbinger.java index 8e51089f0d4..c3115e1e605 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHarbinger.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHarbinger.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvishHerder.java b/Mage.Sets/src/mage/cards/e/ElvishHerder.java index d1fb05a22e1..cc5294ee160 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHerder.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHerder.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java b/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java index afbc477f629..1a78676f33c 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ElvishHunter.java b/Mage.Sets/src/mage/cards/e/ElvishHunter.java index 1aa71466f22..b2e371c2534 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHunter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ElvishLookout.java b/Mage.Sets/src/mage/cards/e/ElvishLookout.java index 7de4feeba97..87b93272814 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishLookout.java +++ b/Mage.Sets/src/mage/cards/e/ElvishLookout.java @@ -27,12 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ElvishLyrist.java b/Mage.Sets/src/mage/cards/e/ElvishLyrist.java index 803c073d637..76563014d75 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishLyrist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishLyrist.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +36,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvishMystic.java b/Mage.Sets/src/mage/cards/e/ElvishMystic.java index 80af0000642..f4d288b0803 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishMystic.java +++ b/Mage.Sets/src/mage/cards/e/ElvishMystic.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java b/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java index 686ecb2ffe4..fa320f44395 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ElvishPioneer.java b/Mage.Sets/src/mage/cards/e/ElvishPioneer.java index 77adf19b9af..9d854f410cd 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPioneer.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPioneer.java @@ -27,16 +27,16 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandCard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvishPiper.java b/Mage.Sets/src/mage/cards/e/ElvishPiper.java index ec9c43522c5..841f8c3186f 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPiper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPiper.java @@ -28,7 +28,6 @@ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ElvishPromenade.java b/Mage.Sets/src/mage/cards/e/ElvishPromenade.java index 4dcea0abf04..c11c8f82f2e 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPromenade.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPromenade.java @@ -27,11 +27,11 @@ */ package mage.cards.e; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ElfToken; diff --git a/Mage.Sets/src/mage/cards/e/ElvishRanger.java b/Mage.Sets/src/mage/cards/e/ElvishRanger.java index ee0f8ebd3b2..484f496def7 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishRanger.java +++ b/Mage.Sets/src/mage/cards/e/ElvishRanger.java @@ -27,12 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvishScout.java b/Mage.Sets/src/mage/cards/e/ElvishScout.java index f8246760953..b1435d6daf8 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishScout.java +++ b/Mage.Sets/src/mage/cards/e/ElvishScout.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ElvishScrapper.java b/Mage.Sets/src/mage/cards/e/ElvishScrapper.java index 9e88fe3dbf8..b443f0b747d 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishScrapper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishScrapper.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +36,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java b/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java index a2efb5fe010..27fc953ebc8 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishSkysweeper.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +36,15 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java b/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java index 52240e5f4e9..e27498add3f 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java +++ b/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ElvishSpiritGuide.java b/Mage.Sets/src/mage/cards/e/ElvishSpiritGuide.java index 2ebf9893193..11c555b9e41 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishSpiritGuide.java +++ b/Mage.Sets/src/mage/cards/e/ElvishSpiritGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ElvishVanguard.java b/Mage.Sets/src/mage/cards/e/ElvishVanguard.java index 9fb82ec10cc..00487f2bf85 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishVanguard.java +++ b/Mage.Sets/src/mage/cards/e/ElvishVanguard.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -39,6 +38,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ElvishVisionary.java b/Mage.Sets/src/mage/cards/e/ElvishVisionary.java index db34d6e6842..9c5c8c3ae58 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishVisionary.java +++ b/Mage.Sets/src/mage/cards/e/ElvishVisionary.java @@ -28,13 +28,14 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ElvishWarrior.java b/Mage.Sets/src/mage/cards/e/ElvishWarrior.java index 3f89de215a3..95afb7c57a8 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishWarrior.java +++ b/Mage.Sets/src/mage/cards/e/ElvishWarrior.java @@ -27,11 +27,12 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EmancipationAngel.java b/Mage.Sets/src/mage/cards/e/EmancipationAngel.java index c73a3738c5e..5027758d493 100644 --- a/Mage.Sets/src/mage/cards/e/EmancipationAngel.java +++ b/Mage.Sets/src/mage/cards/e/EmancipationAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EmbalmedBrawler.java b/Mage.Sets/src/mage/cards/e/EmbalmedBrawler.java index b4c0e2a79f9..e495d73e397 100644 --- a/Mage.Sets/src/mage/cards/e/EmbalmedBrawler.java +++ b/Mage.Sets/src/mage/cards/e/EmbalmedBrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/Embargo.java b/Mage.Sets/src/mage/cards/e/Embargo.java index 1393baba798..9101ce61780 100644 --- a/Mage.Sets/src/mage/cards/e/Embargo.java +++ b/Mage.Sets/src/mage/cards/e/Embargo.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EmberBeast.java b/Mage.Sets/src/mage/cards/e/EmberBeast.java index 2c715082c8e..bec943915be 100644 --- a/Mage.Sets/src/mage/cards/e/EmberBeast.java +++ b/Mage.Sets/src/mage/cards/e/EmberBeast.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.CantAttackAloneAbility; import mage.abilities.keyword.CantBlockAloneAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java b/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java index e2d78156ad6..41a6e2db86e 100644 --- a/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java +++ b/Mage.Sets/src/mage/cards/e/EmberEyeWolf.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EmberFistZubera.java b/Mage.Sets/src/mage/cards/e/EmberFistZubera.java index 9b1a23be86c..55e5e13c48c 100644 --- a/Mage.Sets/src/mage/cards/e/EmberFistZubera.java +++ b/Mage.Sets/src/mage/cards/e/EmberFistZubera.java @@ -28,19 +28,19 @@ package mage.cards.e; -import java.util.UUID; - -import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.ZuberasDiedWatcher; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EmberGale.java b/Mage.Sets/src/mage/cards/e/EmberGale.java index 37137f45c6f..f03dafd3e9b 100644 --- a/Mage.Sets/src/mage/cards/e/EmberGale.java +++ b/Mage.Sets/src/mage/cards/e/EmberGale.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EmberHauler.java b/Mage.Sets/src/mage/cards/e/EmberHauler.java index 8140b0a6bb2..b35e05c9618 100644 --- a/Mage.Sets/src/mage/cards/e/EmberHauler.java +++ b/Mage.Sets/src/mage/cards/e/EmberHauler.java @@ -28,9 +28,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,12 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/EmberShot.java b/Mage.Sets/src/mage/cards/e/EmberShot.java index d9b77045fed..349c1466564 100644 --- a/Mage.Sets/src/mage/cards/e/EmberShot.java +++ b/Mage.Sets/src/mage/cards/e/EmberShot.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EmberSwallower.java b/Mage.Sets/src/mage/cards/e/EmberSwallower.java index d745e468e75..84d822c3e04 100644 --- a/Mage.Sets/src/mage/cards/e/EmberSwallower.java +++ b/Mage.Sets/src/mage/cards/e/EmberSwallower.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmberWeaver.java b/Mage.Sets/src/mage/cards/e/EmberWeaver.java index 6fb78a2ab03..a9f10e55a7b 100644 --- a/Mage.Sets/src/mage/cards/e/EmberWeaver.java +++ b/Mage.Sets/src/mage/cards/e/EmberWeaver.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -41,11 +38,14 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java index 9033b71b938..fcac60d8bf7 100644 --- a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java +++ b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EmbermawHellion.java b/Mage.Sets/src/mage/cards/e/EmbermawHellion.java index beba51603f8..8c0700ca45f 100644 --- a/Mage.Sets/src/mage/cards/e/EmbermawHellion.java +++ b/Mage.Sets/src/mage/cards/e/EmbermawHellion.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/Embersmith.java b/Mage.Sets/src/mage/cards/e/Embersmith.java index 3a95d0e350d..8fa8ed628e3 100644 --- a/Mage.Sets/src/mage/cards/e/Embersmith.java +++ b/Mage.Sets/src/mage/cards/e/Embersmith.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -38,6 +35,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterArtifactSpell; import mage.game.Game; @@ -45,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * @author Loki, North */ diff --git a/Mage.Sets/src/mage/cards/e/EmberstrikeDuo.java b/Mage.Sets/src/mage/cards/e/EmberstrikeDuo.java index 7c191a714ef..a80d9714745 100644 --- a/Mage.Sets/src/mage/cards/e/EmberstrikeDuo.java +++ b/Mage.Sets/src/mage/cards/e/EmberstrikeDuo.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -38,9 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EmberwildeAugur.java b/Mage.Sets/src/mage/cards/e/EmberwildeAugur.java index d8bb666f773..ebd8276bd1e 100644 --- a/Mage.Sets/src/mage/cards/e/EmberwildeAugur.java +++ b/Mage.Sets/src/mage/cards/e/EmberwildeAugur.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.PhaseStep; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java b/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java index 81a4e37104b..43d5c522cc7 100644 --- a/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java +++ b/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java index 37ad396db97..756597d1d6b 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java index 245b29e16dd..2be6c701dca 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java index 9c086cc8faf..776a78d92c7 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java b/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java index 701fb7872b4..194cbe01f15 100644 --- a/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java +++ b/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmbraalGearSmasher.java b/Mage.Sets/src/mage/cards/e/EmbraalGearSmasher.java index 69eec96752c..953df36a0c6 100644 --- a/Mage.Sets/src/mage/cards/e/EmbraalGearSmasher.java +++ b/Mage.Sets/src/mage/cards/e/EmbraalGearSmasher.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmeraldCharm.java b/Mage.Sets/src/mage/cards/e/EmeraldCharm.java index ab599180171..ef29973e0f9 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldCharm.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; @@ -44,6 +43,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java b/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java index 0d7d603380a..fdeb54bce73 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldDragonfly.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java b/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java index 4e0f1b41771..e0574f54629 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/e/EmeraldOryx.java b/Mage.Sets/src/mage/cards/e/EmeraldOryx.java index b9c897d7e2c..88692d20788 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldOryx.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldOryx.java @@ -28,12 +28,13 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EmergeUnscathed.java b/Mage.Sets/src/mage/cards/e/EmergeUnscathed.java index b070e54379f..19fe0b5e97e 100644 --- a/Mage.Sets/src/mage/cards/e/EmergeUnscathed.java +++ b/Mage.Sets/src/mage/cards/e/EmergeUnscathed.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.continuous.GainProtectionFromColorTargetEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EmeriaAngel.java b/Mage.Sets/src/mage/cards/e/EmeriaAngel.java index ec3003fa754..c385264d705 100644 --- a/Mage.Sets/src/mage/cards/e/EmeriaAngel.java +++ b/Mage.Sets/src/mage/cards/e/EmeriaAngel.java @@ -28,16 +28,17 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.BirdToken; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/EmeriaShepherd.java b/Mage.Sets/src/mage/cards/e/EmeriaShepherd.java index c4d7d2c6e27..c8b7215eb96 100644 --- a/Mage.Sets/src/mage/cards/e/EmeriaShepherd.java +++ b/Mage.Sets/src/mage/cards/e/EmeriaShepherd.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java b/Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java index a9ba051f73a..66a60f58ad3 100644 --- a/Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java +++ b/Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EmissaryOfDespair.java b/Mage.Sets/src/mage/cards/e/EmissaryOfDespair.java index 4e1d015ba2d..49fb0ebd13c 100644 --- a/Mage.Sets/src/mage/cards/e/EmissaryOfDespair.java +++ b/Mage.Sets/src/mage/cards/e/EmissaryOfDespair.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; +import java.util.UUID; + /** * * @author wetterlicht diff --git a/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java b/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java index 96169a99185..51a2a1da945 100644 --- a/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java +++ b/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -37,6 +34,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; @@ -45,6 +43,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EmissaryOfTheSleepless.java b/Mage.Sets/src/mage/cards/e/EmissaryOfTheSleepless.java index 9a59d2b726c..ad654bc267e 100644 --- a/Mage.Sets/src/mage/cards/e/EmissaryOfTheSleepless.java +++ b/Mage.Sets/src/mage/cards/e/EmissaryOfTheSleepless.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/e/EmmaraTandris.java b/Mage.Sets/src/mage/cards/e/EmmaraTandris.java index 6d43c5c3793..c794f6b95d8 100644 --- a/Mage.Sets/src/mage/cards/e/EmmaraTandris.java +++ b/Mage.Sets/src/mage/cards/e/EmmaraTandris.java @@ -27,21 +27,19 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.PreventAllDamageToAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterCreatureOrPlayer; import mage.filter.predicate.other.PlayerIdPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +55,7 @@ public class EmmaraTandris extends CardImpl { public EmmaraTandris(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/e/EmmessiTome.java b/Mage.Sets/src/mage/cards/e/EmmessiTome.java index 758f513b11a..3a435e85014 100644 --- a/Mage.Sets/src/mage/cards/e/EmmessiTome.java +++ b/Mage.Sets/src/mage/cards/e/EmmessiTome.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmperorCrocodile.java b/Mage.Sets/src/mage/cards/e/EmperorCrocodile.java index ea8ccec5f0c..3eb634e85b6 100644 --- a/Mage.Sets/src/mage/cards/e/EmperorCrocodile.java +++ b/Mage.Sets/src/mage/cards/e/EmperorCrocodile.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.StateTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/e/EmpressGalina.java b/Mage.Sets/src/mage/cards/e/EmpressGalina.java index 9f8e4d3b662..923ad57ce8a 100644 --- a/Mage.Sets/src/mage/cards/e/EmpressGalina.java +++ b/Mage.Sets/src/mage/cards/e/EmpressGalina.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +37,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -57,7 +59,7 @@ public class EmpressGalina extends CardImpl { public EmpressGalina(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/e/EmptyCityRuse.java b/Mage.Sets/src/mage/cards/e/EmptyCityRuse.java index efdcb8f1f72..f939f3175e9 100644 --- a/Mage.Sets/src/mage/cards/e/EmptyCityRuse.java +++ b/Mage.Sets/src/mage/cards/e/EmptyCityRuse.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.SkipNextCombatEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/e/EmptyTheCatacombs.java b/Mage.Sets/src/mage/cards/e/EmptyTheCatacombs.java index ce2b9944de8..a7c4fef5f72 100644 --- a/Mage.Sets/src/mage/cards/e/EmptyTheCatacombs.java +++ b/Mage.Sets/src/mage/cards/e/EmptyTheCatacombs.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/e/EmptyThePits.java b/Mage.Sets/src/mage/cards/e/EmptyThePits.java index 0b5e1484e1f..7dc4182898b 100644 --- a/Mage.Sets/src/mage/cards/e/EmptyThePits.java +++ b/Mage.Sets/src/mage/cards/e/EmptyThePits.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DelveAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/EmptyTheWarrens.java b/Mage.Sets/src/mage/cards/e/EmptyTheWarrens.java index d3a75df5c75..a94927d1e46 100644 --- a/Mage.Sets/src/mage/cards/e/EmptyTheWarrens.java +++ b/Mage.Sets/src/mage/cards/e/EmptyTheWarrens.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.GoblinToken; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EmpyrealVoyager.java b/Mage.Sets/src/mage/cards/e/EmpyrealVoyager.java index 57b32d97e41..fcb2b16e3e7 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrealVoyager.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrealVoyager.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java b/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java index d11031a8be2..62dfc9dffda 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -38,11 +35,17 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagePlayerEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java b/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java index 779d73330f7..340b7505a06 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java b/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java index ac2490ea330..c7dd429ae2b 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java index 60e7dfbf1b9..1f5fbbf7286 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBeCounteredAbility; import mage.abilities.common.PutIntoGraveFromAnywhereSourceTriggeredAbility; @@ -40,10 +39,13 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorlessPredicate; +import java.util.UUID; + /** * @author Loki */ @@ -57,7 +59,7 @@ public class EmrakulTheAeonsTorn extends CardImpl { public EmrakulTheAeonsTorn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{15}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Eldrazi"); this.power = new MageInt(15); this.toughness = new MageInt(15); diff --git a/Mage.Sets/src/mage/cards/e/EmrakulThePromisedEnd.java b/Mage.Sets/src/mage/cards/e/EmrakulThePromisedEnd.java index 90dd9e87f49..83f9f49b57b 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulThePromisedEnd.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulThePromisedEnd.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -43,11 +40,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -56,6 +49,10 @@ import mage.players.Player; import mage.target.common.TargetOpponent; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author emerald000 @@ -70,7 +67,7 @@ public class EmrakulThePromisedEnd extends CardImpl { public EmrakulThePromisedEnd(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{13}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Eldrazi"); this.power = new MageInt(13); this.toughness = new MageInt(13); diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java index faa9c1ec9a8..ae82b51f2ac 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -51,6 +50,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsHatcher.java b/Mage.Sets/src/mage/cards/e/EmrakulsHatcher.java index 8fc2924b4ef..d75066dc7fc 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsHatcher.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsHatcher.java @@ -28,15 +28,16 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.EldraziSpawnToken; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java b/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java index 8cd4459c16f..dd82596f9a5 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EnatuGolem.java b/Mage.Sets/src/mage/cards/e/EnatuGolem.java index ec44955bcd4..63c2d82fca2 100644 --- a/Mage.Sets/src/mage/cards/e/EnatuGolem.java +++ b/Mage.Sets/src/mage/cards/e/EnatuGolem.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EncaseInIce.java b/Mage.Sets/src/mage/cards/e/EncaseInIce.java index 1cad5e1a46f..9f1e6485c28 100644 --- a/Mage.Sets/src/mage/cards/e/EncaseInIce.java +++ b/Mage.Sets/src/mage/cards/e/EncaseInIce.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EnchantedEvening.java b/Mage.Sets/src/mage/cards/e/EnchantedEvening.java index 8b523b3c264..d4b5052d4ed 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantedEvening.java +++ b/Mage.Sets/src/mage/cards/e/EnchantedEvening.java @@ -27,24 +27,19 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.Effect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.DependencyType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EnchantresssPresence.java b/Mage.Sets/src/mage/cards/e/EnchantresssPresence.java index 66c050e03e1..5e4564ffd89 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantresssPresence.java +++ b/Mage.Sets/src/mage/cards/e/EnchantresssPresence.java @@ -27,15 +27,16 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EncirclingFissure.java b/Mage.Sets/src/mage/cards/e/EncirclingFissure.java index 0ee475fbd93..26cf1eaa6d7 100644 --- a/Mage.Sets/src/mage/cards/e/EncirclingFissure.java +++ b/Mage.Sets/src/mage/cards/e/EncirclingFissure.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.keyword.AwakenAbility; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EnclaveElite.java b/Mage.Sets/src/mage/cards/e/EnclaveElite.java index 27844d3b346..f576701c27e 100644 --- a/Mage.Sets/src/mage/cards/e/EnclaveElite.java +++ b/Mage.Sets/src/mage/cards/e/EnclaveElite.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; @@ -37,8 +35,11 @@ import mage.abilities.keyword.IslandwalkAbility; import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/Encroach.java b/Mage.Sets/src/mage/cards/e/Encroach.java index 69335e08676..2fafeb3c3ce 100644 --- a/Mage.Sets/src/mage/cards/e/Encroach.java +++ b/Mage.Sets/src/mage/cards/e/Encroach.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EncroachingWastes.java b/Mage.Sets/src/mage/cards/e/EncroachingWastes.java index a1247245b3c..56b79a322df 100644 --- a/Mage.Sets/src/mage/cards/e/EncroachingWastes.java +++ b/Mage.Sets/src/mage/cards/e/EncroachingWastes.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Encrust.java b/Mage.Sets/src/mage/cards/e/Encrust.java index 0f722bfb97e..c9b4d6bb60c 100644 --- a/Mage.Sets/src/mage/cards/e/Encrust.java +++ b/Mage.Sets/src/mage/cards/e/Encrust.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EndHostilities.java b/Mage.Sets/src/mage/cards/e/EndHostilities.java index 2f21308aca2..f8616cfae5d 100644 --- a/Mage.Sets/src/mage/cards/e/EndHostilities.java +++ b/Mage.Sets/src/mage/cards/e/EndHostilities.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.ArrayList; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +37,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EndangeredArmodon.java b/Mage.Sets/src/mage/cards/e/EndangeredArmodon.java index 523c4c7d084..8bb2bc77b30 100644 --- a/Mage.Sets/src/mage/cards/e/EndangeredArmodon.java +++ b/Mage.Sets/src/mage/cards/e/EndangeredArmodon.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -38,6 +37,8 @@ import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/Endbringer.java b/Mage.Sets/src/mage/cards/e/Endbringer.java index c4290c2f7b8..c00c7b6bc70 100644 --- a/Mage.Sets/src/mage/cards/e/Endbringer.java +++ b/Mage.Sets/src/mage/cards/e/Endbringer.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EndlessCockroaches.java b/Mage.Sets/src/mage/cards/e/EndlessCockroaches.java index 6a77591b3df..8a9741d463e 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessCockroaches.java +++ b/Mage.Sets/src/mage/cards/e/EndlessCockroaches.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EndlessHorizons.java b/Mage.Sets/src/mage/cards/e/EndlessHorizons.java index 7e10d7e92ea..02cb8b4b952 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessHorizons.java +++ b/Mage.Sets/src/mage/cards/e/EndlessHorizons.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -50,6 +49,8 @@ import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EndlessObedience.java b/Mage.Sets/src/mage/cards/e/EndlessObedience.java index 5845f23a802..8968957adde 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessObedience.java +++ b/Mage.Sets/src/mage/cards/e/EndlessObedience.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/EndlessOne.java b/Mage.Sets/src/mage/cards/e/EndlessOne.java index 08f642c8ecd..353be84711e 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessOne.java +++ b/Mage.Sets/src/mage/cards/e/EndlessOne.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java b/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java index f8f82c882a2..4faf8f1143b 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java +++ b/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/e/EndlessScream.java b/Mage.Sets/src/mage/cards/e/EndlessScream.java index 0ed3b15c10f..a78e3d1016a 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessScream.java +++ b/Mage.Sets/src/mage/cards/e/EndlessScream.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.counters.CounterType; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EndlessSwarm.java b/Mage.Sets/src/mage/cards/e/EndlessSwarm.java index 3ba6c8748e8..5eccd6258ea 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessSwarm.java +++ b/Mage.Sets/src/mage/cards/e/EndlessSwarm.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.EpicEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.SnakeToken; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java index 36e78b8071d..0bbc0df053c 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java +++ b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/Endoskeleton.java b/Mage.Sets/src/mage/cards/e/Endoskeleton.java index 53a52af8ebd..ccc5ae946e2 100644 --- a/Mage.Sets/src/mage/cards/e/Endoskeleton.java +++ b/Mage.Sets/src/mage/cards/e/Endoskeleton.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SkipUntapOptionalAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java b/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java index 220b63e656e..2c0e885e83a 100644 --- a/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java +++ b/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.StaticFilters; @@ -48,6 +48,8 @@ import mage.game.permanent.token.ThrullToken; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +58,7 @@ public class EndrekSahrMasterBreeder extends CardImpl { public EndrekSahrMasterBreeder(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/e/Endure.java b/Mage.Sets/src/mage/cards/e/Endure.java index a8f8585d4e5..fc71356f4bb 100644 --- a/Mage.Sets/src/mage/cards/e/Endure.java +++ b/Mage.Sets/src/mage/cards/e/Endure.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.PreventAllDamageToAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.common.FilterPermanentOrPlayer; import mage.filter.predicate.other.PlayerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EnduringIdeal.java b/Mage.Sets/src/mage/cards/e/EnduringIdeal.java index 90d0f6cf58e..f8f725501ac 100644 --- a/Mage.Sets/src/mage/cards/e/EnduringIdeal.java +++ b/Mage.Sets/src/mage/cards/e/EnduringIdeal.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.EpicEffect; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EnduringRenewal.java b/Mage.Sets/src/mage/cards/e/EnduringRenewal.java index 3f0c2bc2c32..468676bd4e4 100644 --- a/Mage.Sets/src/mage/cards/e/EnduringRenewal.java +++ b/Mage.Sets/src/mage/cards/e/EnduringRenewal.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility; @@ -37,17 +36,8 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -55,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/e/EnduringScalelord.java b/Mage.Sets/src/mage/cards/e/EnduringScalelord.java index 5657a55a735..0e1e7adff0b 100644 --- a/Mage.Sets/src/mage/cards/e/EnduringScalelord.java +++ b/Mage.Sets/src/mage/cards/e/EnduringScalelord.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EnduringVictory.java b/Mage.Sets/src/mage/cards/e/EnduringVictory.java index c5f33a6fb95..74554389824 100644 --- a/Mage.Sets/src/mage/cards/e/EnduringVictory.java +++ b/Mage.Sets/src/mage/cards/e/EnduringVictory.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.keyword.BolsterEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EnemyOfTheGuildpact.java b/Mage.Sets/src/mage/cards/e/EnemyOfTheGuildpact.java index b75a31424a2..5b5d61a4d1a 100644 --- a/Mage.Sets/src/mage/cards/e/EnemyOfTheGuildpact.java +++ b/Mage.Sets/src/mage/cards/e/EnemyOfTheGuildpact.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.MulticoloredPredicate; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/e/Energizer.java b/Mage.Sets/src/mage/cards/e/Energizer.java index 254e5671114..c94e9377633 100644 --- a/Mage.Sets/src/mage/cards/e/Energizer.java +++ b/Mage.Sets/src/mage/cards/e/Energizer.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EnergyChamber.java b/Mage.Sets/src/mage/cards/e/EnergyChamber.java index 7982cff689a..c0cac3b6e37 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyChamber.java +++ b/Mage.Sets/src/mage/cards/e/EnergyChamber.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EnergyField.java b/Mage.Sets/src/mage/cards/e/EnergyField.java index 251373adc48..5c4c902f421 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyField.java +++ b/Mage.Sets/src/mage/cards/e/EnergyField.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.Objects; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +41,9 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.Objects; +import java.util.UUID; + /** * @author Plopman */ diff --git a/Mage.Sets/src/mage/cards/e/EnergyFlux.java b/Mage.Sets/src/mage/cards/e/EnergyFlux.java index a944cb5e1ac..4e019b2baa0 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyFlux.java +++ b/Mage.Sets/src/mage/cards/e/EnergyFlux.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -41,6 +40,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/EnergyTap.java b/Mage.Sets/src/mage/cards/e/EnergyTap.java index 2eab4647597..d944cc383e3 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyTap.java +++ b/Mage.Sets/src/mage/cards/e/EnergyTap.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/e/Enervate.java b/Mage.Sets/src/mage/cards/e/Enervate.java index 0ffda70145b..037554c5437 100644 --- a/Mage.Sets/src/mage/cards/e/Enervate.java +++ b/Mage.Sets/src/mage/cards/e/Enervate.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Enfeeblement.java b/Mage.Sets/src/mage/cards/e/Enfeeblement.java index 055f6cf9633..f1d1f3a8f7f 100644 --- a/Mage.Sets/src/mage/cards/e/Enfeeblement.java +++ b/Mage.Sets/src/mage/cards/e/Enfeeblement.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,9 +34,15 @@ 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.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java b/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java index a8259400c5b..079ada9e71c 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredExplosives.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +36,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.counters.CounterType; @@ -46,6 +44,8 @@ import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EngineeredMight.java b/Mage.Sets/src/mage/cards/e/EngineeredMight.java index 26635ae446a..9e2514efcac 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredMight.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredMight.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EngineeredPlague.java b/Mage.Sets/src/mage/cards/e/EngineeredPlague.java index e222c05f2af..0ac1a627c0b 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredPlague.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredPlague.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.ChooseCreatureTypeEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EngulfTheShore.java b/Mage.Sets/src/mage/cards/e/EngulfTheShore.java index 3a4cdbeb600..4722074460b 100644 --- a/Mage.Sets/src/mage/cards/e/EngulfTheShore.java +++ b/Mage.Sets/src/mage/cards/e/EngulfTheShore.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -48,6 +45,10 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EngulfingFlames.java b/Mage.Sets/src/mage/cards/e/EngulfingFlames.java index 39820d828d8..1084b49cd6a 100644 --- a/Mage.Sets/src/mage/cards/e/EngulfingFlames.java +++ b/Mage.Sets/src/mage/cards/e/EngulfingFlames.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.ruleModifying.CantRegenerateTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author cbt33, North diff --git a/Mage.Sets/src/mage/cards/e/EngulfingSlagwurm.java b/Mage.Sets/src/mage/cards/e/EngulfingSlagwurm.java index 2b030ae2ab6..95de3da963c 100644 --- a/Mage.Sets/src/mage/cards/e/EngulfingSlagwurm.java +++ b/Mage.Sets/src/mage/cards/e/EngulfingSlagwurm.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EnhancedAwareness.java b/Mage.Sets/src/mage/cards/e/EnhancedAwareness.java index b830f289389..5ea0b07ad64 100644 --- a/Mage.Sets/src/mage/cards/e/EnhancedAwareness.java +++ b/Mage.Sets/src/mage/cards/e/EnhancedAwareness.java @@ -27,12 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java b/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java index 5d0b14f2e1b..d3c42ae8db0 100644 --- a/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EnigmaSphinx.java b/Mage.Sets/src/mage/cards/e/EnigmaSphinx.java index 01e15692616..b456971b2d4 100644 --- a/Mage.Sets/src/mage/cards/e/EnigmaSphinx.java +++ b/Mage.Sets/src/mage/cards/e/EnigmaSphinx.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Library; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Enlarge.java b/Mage.Sets/src/mage/cards/e/Enlarge.java index 6f8455481ef..6059c42fc09 100644 --- a/Mage.Sets/src/mage/cards/e/Enlarge.java +++ b/Mage.Sets/src/mage/cards/e/Enlarge.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.combat.MustBeBlockedByAtLeastOneTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java b/Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java index 482932feecc..a935752a4e0 100644 --- a/Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java +++ b/Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/e/EnlightenedManiac.java b/Mage.Sets/src/mage/cards/e/EnlightenedManiac.java index 6b3db45e71d..3881c120dd0 100644 --- a/Mage.Sets/src/mage/cards/e/EnlightenedManiac.java +++ b/Mage.Sets/src/mage/cards/e/EnlightenedManiac.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.EldraziHorrorToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EnlightenedTutor.java b/Mage.Sets/src/mage/cards/e/EnlightenedTutor.java index 7500a0f6b02..057f14181db 100644 --- a/Mage.Sets/src/mage/cards/e/EnlightenedTutor.java +++ b/Mage.Sets/src/mage/cards/e/EnlightenedTutor.java @@ -27,16 +27,17 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EnlistedWurm.java b/Mage.Sets/src/mage/cards/e/EnlistedWurm.java index 107552e08f7..59eca43755e 100644 --- a/Mage.Sets/src/mage/cards/e/EnlistedWurm.java +++ b/Mage.Sets/src/mage/cards/e/EnlistedWurm.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EnlistmentOfficer.java b/Mage.Sets/src/mage/cards/e/EnlistmentOfficer.java index 4f28dd9b923..d14ed147552 100644 --- a/Mage.Sets/src/mage/cards/e/EnlistmentOfficer.java +++ b/Mage.Sets/src/mage/cards/e/EnlistmentOfficer.java @@ -27,18 +27,19 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EnormousBaloth.java b/Mage.Sets/src/mage/cards/e/EnormousBaloth.java index 2c94387ce38..877f63a1939 100644 --- a/Mage.Sets/src/mage/cards/e/EnormousBaloth.java +++ b/Mage.Sets/src/mage/cards/e/EnormousBaloth.java @@ -27,11 +27,12 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/Enrage.java b/Mage.Sets/src/mage/cards/e/Enrage.java index 6c575331cc4..91376358800 100644 --- a/Mage.Sets/src/mage/cards/e/Enrage.java +++ b/Mage.Sets/src/mage/cards/e/Enrage.java @@ -27,17 +27,17 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EnragedGiant.java b/Mage.Sets/src/mage/cards/e/EnragedGiant.java index 59a22434c52..e6a6508429e 100644 --- a/Mage.Sets/src/mage/cards/e/EnragedGiant.java +++ b/Mage.Sets/src/mage/cards/e/EnragedGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ImproviseAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/EnragedRevolutionary.java b/Mage.Sets/src/mage/cards/e/EnragedRevolutionary.java index 09509bca2bf..7e081724f21 100644 --- a/Mage.Sets/src/mage/cards/e/EnragedRevolutionary.java +++ b/Mage.Sets/src/mage/cards/e/EnragedRevolutionary.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DethroneAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EnragingLicid.java b/Mage.Sets/src/mage/cards/e/EnragingLicid.java index 34122ded590..311c02fc862 100644 --- a/Mage.Sets/src/mage/cards/e/EnragingLicid.java +++ b/Mage.Sets/src/mage/cards/e/EnragingLicid.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LicidAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/EnshrinedMemories.java b/Mage.Sets/src/mage/cards/e/EnshrinedMemories.java index e031c4c19b0..a9cb2d6cf9c 100644 --- a/Mage.Sets/src/mage/cards/e/EnshrinedMemories.java +++ b/Mage.Sets/src/mage/cards/e/EnshrinedMemories.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EnshroudingMist.java b/Mage.Sets/src/mage/cards/e/EnshroudingMist.java index da743f65a67..6b7805714e3 100644 --- a/Mage.Sets/src/mage/cards/e/EnshroudingMist.java +++ b/Mage.Sets/src/mage/cards/e/EnshroudingMist.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.condition.common.RenownedTargetCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Enslave.java b/Mage.Sets/src/mage/cards/e/Enslave.java index f16a66a34db..28140cd9d8f 100644 --- a/Mage.Sets/src/mage/cards/e/Enslave.java +++ b/Mage.Sets/src/mage/cards/e/Enslave.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EnslavedDwarf.java b/Mage.Sets/src/mage/cards/e/EnslavedDwarf.java index 8a7ade4c883..1a15fd7ca8f 100644 --- a/Mage.Sets/src/mage/cards/e/EnslavedDwarf.java +++ b/Mage.Sets/src/mage/cards/e/EnslavedDwarf.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author tomd1990 diff --git a/Mage.Sets/src/mage/cards/e/EnslavedScout.java b/Mage.Sets/src/mage/cards/e/EnslavedScout.java index b82bcf07cb4..2b472b4a9c9 100644 --- a/Mage.Sets/src/mage/cards/e/EnslavedScout.java +++ b/Mage.Sets/src/mage/cards/e/EnslavedScout.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Ensnare.java b/Mage.Sets/src/mage/cards/e/Ensnare.java index 1d3d12301b3..b57fd095b63 100644 --- a/Mage.Sets/src/mage/cards/e/Ensnare.java +++ b/Mage.Sets/src/mage/cards/e/Ensnare.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.TapAllEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java b/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java index ba74af82a29..376dd47cd3a 100644 --- a/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java +++ b/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java index fecaabd681a..377d58518da 100644 --- a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java +++ b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java index 53c4bd68176..62c72a45e97 100644 --- a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java +++ b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EntanglingTrap.java b/Mage.Sets/src/mage/cards/e/EntanglingTrap.java index 982b22d52ac..00614404500 100644 --- a/Mage.Sets/src/mage/cards/e/EntanglingTrap.java +++ b/Mage.Sets/src/mage/cards/e/EntanglingTrap.java @@ -27,11 +27,9 @@ */ package mage.cards.e; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; @@ -43,10 +41,13 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.abilities.effects.Effect; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCreaturePermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EntanglingVines.java b/Mage.Sets/src/mage/cards/e/EntanglingVines.java index 6f2edea989e..b4975c565f3 100644 --- a/Mage.Sets/src/mage/cards/e/EntanglingVines.java +++ b/Mage.Sets/src/mage/cards/e/EntanglingVines.java @@ -27,21 +27,22 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java b/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java index d916a13ad6c..7b1fe640e39 100644 --- a/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java +++ b/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -47,6 +46,8 @@ import mage.game.turn.Step; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EnthrallingVictor.java b/Mage.Sets/src/mage/cards/e/EnthrallingVictor.java index d95f81a35db..47246346e93 100644 --- a/Mage.Sets/src/mage/cards/e/EnthrallingVictor.java +++ b/Mage.Sets/src/mage/cards/e/EnthrallingVictor.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/e/Entomb.java b/Mage.Sets/src/mage/cards/e/Entomb.java index aef7cac2436..3dee0cea17c 100644 --- a/Mage.Sets/src/mage/cards/e/Entomb.java +++ b/Mage.Sets/src/mage/cards/e/Entomb.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EntomberExarch.java b/Mage.Sets/src/mage/cards/e/EntomberExarch.java index b7f5b2af5d5..487ea11383f 100644 --- a/Mage.Sets/src/mage/cards/e/EntomberExarch.java +++ b/Mage.Sets/src/mage/cards/e/EntomberExarch.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -50,6 +49,8 @@ import mage.target.TargetCard; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java b/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java index 1cb3fd9c70d..4d9d22194a1 100644 --- a/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java +++ b/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EntrapmentManeuver.java b/Mage.Sets/src/mage/cards/e/EntrapmentManeuver.java index 999f1be6fd7..5b682d4a472 100644 --- a/Mage.Sets/src/mage/cards/e/EntrapmentManeuver.java +++ b/Mage.Sets/src/mage/cards/e/EntrapmentManeuver.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -45,6 +44,8 @@ import mage.target.Target; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java b/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java index 9196a39dd5c..b8c6e5c6b17 100644 --- a/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java +++ b/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java @@ -27,13 +27,13 @@ */ package mage.cards.e; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.MiracleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.AngelToken; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/e/EntropicEidolon.java b/Mage.Sets/src/mage/cards/e/EntropicEidolon.java index 4a62d593506..718d74b4518 100644 --- a/Mage.Sets/src/mage/cards/e/EntropicEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EntropicEidolon.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EntropicSpecter.java b/Mage.Sets/src/mage/cards/e/EntropicSpecter.java index 00ac5ea15bb..1c71d6f4ae6 100644 --- a/Mage.Sets/src/mage/cards/e/EntropicSpecter.java +++ b/Mage.Sets/src/mage/cards/e/EntropicSpecter.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -41,14 +40,12 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/Envelop.java b/Mage.Sets/src/mage/cards/e/Envelop.java index be2a62914ef..f114e3bf184 100644 --- a/Mage.Sets/src/mage/cards/e/Envelop.java +++ b/Mage.Sets/src/mage/cards/e/Envelop.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EonHub.java b/Mage.Sets/src/mage/cards/e/EonHub.java index 9c2ae64a89a..b4d230d482a 100644 --- a/Mage.Sets/src/mage/cards/e/EonHub.java +++ b/Mage.Sets/src/mage/cards/e/EonHub.java @@ -5,18 +5,22 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.players.Player; +import java.util.UUID; + /** * * @author nick.myers diff --git a/Mage.Sets/src/mage/cards/e/EpharaGodOfThePolis.java b/Mage.Sets/src/mage/cards/e/EpharaGodOfThePolis.java index 8dc079c67cc..8b899807066 100644 --- a/Mage.Sets/src/mage/cards/e/EpharaGodOfThePolis.java +++ b/Mage.Sets/src/mage/cards/e/EpharaGodOfThePolis.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,14 +40,13 @@ import mage.abilities.effects.common.continuous.LoseCreatureTypeSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.watchers.common.PermanentsEnteredBattlefieldWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +55,7 @@ public class EpharaGodOfThePolis extends CardImpl { public EpharaGodOfThePolis(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{2}{W}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java b/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java index 419eee9a19a..fdee056371b 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java +++ b/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -49,6 +48,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java index cc378248297..228e8c9a6b3 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java +++ b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,14 +38,12 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EpharasWarden.java b/Mage.Sets/src/mage/cards/e/EpharasWarden.java index 8b1e40825e2..95a528299a7 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasWarden.java +++ b/Mage.Sets/src/mage/cards/e/EpharasWarden.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EphemeralShields.java b/Mage.Sets/src/mage/cards/e/EphemeralShields.java index 9baea4488c5..ea098996979 100644 --- a/Mage.Sets/src/mage/cards/e/EphemeralShields.java +++ b/Mage.Sets/src/mage/cards/e/EphemeralShields.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.IndestructibleAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Ephemeron.java b/Mage.Sets/src/mage/cards/e/Ephemeron.java index dd66dd573cf..13f30b81707 100644 --- a/Mage.Sets/src/mage/cards/e/Ephemeron.java +++ b/Mage.Sets/src/mage/cards/e/Ephemeron.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EpicConfrontation.java b/Mage.Sets/src/mage/cards/e/EpicConfrontation.java index 30f6f9e8842..1100aa07885 100644 --- a/Mage.Sets/src/mage/cards/e/EpicConfrontation.java +++ b/Mage.Sets/src/mage/cards/e/EpicConfrontation.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.FightTargetsEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -42,6 +41,8 @@ import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EpicExperiment.java b/Mage.Sets/src/mage/cards/e/EpicExperiment.java index a2e8d0670ac..302aaf5e8af 100644 --- a/Mage.Sets/src/mage/cards/e/EpicExperiment.java +++ b/Mage.Sets/src/mage/cards/e/EpicExperiment.java @@ -27,15 +27,10 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -48,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EpicProportions.java b/Mage.Sets/src/mage/cards/e/EpicProportions.java index d25e89d9191..ff1468d835d 100644 --- a/Mage.Sets/src/mage/cards/e/EpicProportions.java +++ b/Mage.Sets/src/mage/cards/e/EpicProportions.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -38,6 +37,7 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/e/EpicStruggle.java b/Mage.Sets/src/mage/cards/e/EpicStruggle.java index 89c152ace2e..625e8faea0e 100644 --- a/Mage.Sets/src/mage/cards/e/EpicStruggle.java +++ b/Mage.Sets/src/mage/cards/e/EpicStruggle.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -40,6 +38,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/e/EpiphanyAtTheDrownyard.java b/Mage.Sets/src/mage/cards/e/EpiphanyAtTheDrownyard.java index 41ff18625ba..a128dd0d5a3 100644 --- a/Mage.Sets/src/mage/cards/e/EpiphanyAtTheDrownyard.java +++ b/Mage.Sets/src/mage/cards/e/EpiphanyAtTheDrownyard.java @@ -27,18 +27,10 @@ */ package mage.cards.e; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -50,6 +42,11 @@ import mage.target.TargetCard; import mage.target.common.TargetOpponent; import mage.util.GameLog; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java index f5a360a32c2..b457225382a 100644 --- a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java +++ b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/EpitaphGolem.java b/Mage.Sets/src/mage/cards/e/EpitaphGolem.java index c670e6d4eea..210d71a25c5 100644 --- a/Mage.Sets/src/mage/cards/e/EpitaphGolem.java +++ b/Mage.Sets/src/mage/cards/e/EpitaphGolem.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Epochrasite.java b/Mage.Sets/src/mage/cards/e/Epochrasite.java index eb59197334e..bce085d6ef6 100644 --- a/Mage.Sets/src/mage/cards/e/Epochrasite.java +++ b/Mage.Sets/src/mage/cards/e/Epochrasite.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -50,6 +49,8 @@ import mage.game.Game; import mage.players.Player; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EquestrianSkill.java b/Mage.Sets/src/mage/cards/e/EquestrianSkill.java index 93d412c9ab2..0fb3fd20ce6 100644 --- a/Mage.Sets/src/mage/cards/e/EquestrianSkill.java +++ b/Mage.Sets/src/mage/cards/e/EquestrianSkill.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureSubtypeCondition; @@ -39,14 +38,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Equilibrium.java b/Mage.Sets/src/mage/cards/e/Equilibrium.java index 191fe0ffe5b..137edd3b710 100644 --- a/Mage.Sets/src/mage/cards/e/Equilibrium.java +++ b/Mage.Sets/src/mage/cards/e/Equilibrium.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.filter.StaticFilters; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/Equipoise.java b/Mage.Sets/src/mage/cards/e/Equipoise.java index 7f3f5268041..4613d1cad44 100644 --- a/Mage.Sets/src/mage/cards/e/Equipoise.java +++ b/Mage.Sets/src/mage/cards/e/Equipoise.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -48,6 +46,9 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.target.TargetPlayer; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EraOfInnovation.java b/Mage.Sets/src/mage/cards/e/EraOfInnovation.java index 53ed0f97d80..03c06a99e67 100644 --- a/Mage.Sets/src/mage/cards/e/EraOfInnovation.java +++ b/Mage.Sets/src/mage/cards/e/EraOfInnovation.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Eradicate.java b/Mage.Sets/src/mage/cards/e/Eradicate.java index 63cc29b2964..30562fbf9c5 100644 --- a/Mage.Sets/src/mage/cards/e/Eradicate.java +++ b/Mage.Sets/src/mage/cards/e/Eradicate.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.ExileTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Erase.java b/Mage.Sets/src/mage/cards/e/Erase.java index ed905a06fc7..d51506d1cb9 100644 --- a/Mage.Sets/src/mage/cards/e/Erase.java +++ b/Mage.Sets/src/mage/cards/e/Erase.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java b/Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java index 8e56e5ba93a..4403c060d6d 100644 --- a/Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java +++ b/Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -37,6 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -45,6 +45,8 @@ import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.CastSpellLastTurnWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class ErayoSoratamiAscendant extends CardImpl { public ErayoSoratamiAscendant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Moonfolk"); this.subtype.add("Monk"); this.power = new MageInt(1); @@ -121,7 +123,7 @@ class ErayosEssence extends Token { ErayosEssence() { super("Erayo's Essence", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.ENCHANTMENT); color.setBlue(true); diff --git a/Mage.Sets/src/mage/cards/e/ErdwalIlluminator.java b/Mage.Sets/src/mage/cards/e/ErdwalIlluminator.java index 399844735b2..33d845dce87 100644 --- a/Mage.Sets/src/mage/cards/e/ErdwalIlluminator.java +++ b/Mage.Sets/src/mage/cards/e/ErdwalIlluminator.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.HashMap; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.keyword.InvestigateEffect; @@ -43,6 +41,9 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ErdwalRipper.java b/Mage.Sets/src/mage/cards/e/ErdwalRipper.java index bd7564c6fdf..3e14e87bdb4 100644 --- a/Mage.Sets/src/mage/cards/e/ErdwalRipper.java +++ b/Mage.Sets/src/mage/cards/e/ErdwalRipper.java @@ -27,16 +27,17 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ErebosGodOfTheDead.java b/Mage.Sets/src/mage/cards/e/ErebosGodOfTheDead.java index 1c2de149b4f..1e3ea582770 100644 --- a/Mage.Sets/src/mage/cards/e/ErebosGodOfTheDead.java +++ b/Mage.Sets/src/mage/cards/e/ErebosGodOfTheDead.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,16 +41,12 @@ import mage.abilities.effects.common.continuous.LoseCreatureTypeSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +55,7 @@ public class ErebosGodOfTheDead extends CardImpl { public ErebosGodOfTheDead(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/e/ErebossTitan.java b/Mage.Sets/src/mage/cards/e/ErebossTitan.java index 80c1f0d88a9..1d052dd4710 100644 --- a/Mage.Sets/src/mage/cards/e/ErebossTitan.java +++ b/Mage.Sets/src/mage/cards/e/ErebossTitan.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.TriggeredAbilityImpl; @@ -53,6 +52,8 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ErgRaiders.java b/Mage.Sets/src/mage/cards/e/ErgRaiders.java index 47422c7a89d..2068a250a7b 100644 --- a/Mage.Sets/src/mage/cards/e/ErgRaiders.java +++ b/Mage.Sets/src/mage/cards/e/ErgRaiders.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java b/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java index 5024aed3a2e..1e15e2f3275 100644 --- a/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java +++ b/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EronTheRelentless.java b/Mage.Sets/src/mage/cards/e/EronTheRelentless.java index 770d07cb93d..47a8791ff1d 100644 --- a/Mage.Sets/src/mage/cards/e/EronTheRelentless.java +++ b/Mage.Sets/src/mage/cards/e/EronTheRelentless.java @@ -27,18 +27,20 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.abilities.Ability; import mage.MageInt; +import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author shieldal @@ -47,7 +49,7 @@ public class EronTheRelentless extends CardImpl { public EronTheRelentless(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java b/Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java index fac6774d266..3fceb224a82 100644 --- a/Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java +++ b/Mage.Sets/src/mage/cards/e/ErrantDoomsayers.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ErrantEphemeron.java b/Mage.Sets/src/mage/cards/e/ErrantEphemeron.java index 114c7f50ca6..e694554aabe 100644 --- a/Mage.Sets/src/mage/cards/e/ErrantEphemeron.java +++ b/Mage.Sets/src/mage/cards/e/ErrantEphemeron.java @@ -27,14 +27,15 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SuspendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/Errantry.java b/Mage.Sets/src/mage/cards/e/Errantry.java index cfbdf440980..d5b4c0ef7ca 100644 --- a/Mage.Sets/src/mage/cards/e/Errantry.java +++ b/Mage.Sets/src/mage/cards/e/Errantry.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java index c626519798d..c2c76981b67 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java +++ b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/e/ErraticMutation.java b/Mage.Sets/src/mage/cards/e/ErraticMutation.java index 1789167d019..e17d6bd881e 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticMutation.java +++ b/Mage.Sets/src/mage/cards/e/ErraticMutation.java @@ -27,12 +27,7 @@ */ package mage.cards.e; -import java.util.UUID; - import mage.MageObject; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -41,11 +36,16 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ErraticPortal.java b/Mage.Sets/src/mage/cards/e/ErraticPortal.java index c0e18d98e70..80181820b36 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticPortal.java +++ b/Mage.Sets/src/mage/cards/e/ErraticPortal.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -39,6 +36,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; @@ -46,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/ErsatzGnomes.java b/Mage.Sets/src/mage/cards/e/ErsatzGnomes.java index 59bedb0ea96..eb19e986e19 100644 --- a/Mage.Sets/src/mage/cards/e/ErsatzGnomes.java +++ b/Mage.Sets/src/mage/cards/e/ErsatzGnomes.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java b/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java index 33e0bcf7d89..900aec83601 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java +++ b/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -45,6 +45,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -59,7 +61,7 @@ public class ErtaiTheCorrupted extends CardImpl { public ErtaiTheCorrupted(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java b/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java index ac69322ddb6..be720ed298c 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java +++ b/Mage.Sets/src/mage/cards/e/ErtaiWizardAdept.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -49,7 +50,7 @@ public class ErtaiWizardAdept extends CardImpl { public ErtaiWizardAdept(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/e/ErtaisTrickery.java b/Mage.Sets/src/mage/cards/e/ErtaisTrickery.java index ea0b655c622..569cb7b46ef 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaisTrickery.java +++ b/Mage.Sets/src/mage/cards/e/ErtaisTrickery.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; import mage.abilities.effects.common.CounterTargetEffect; @@ -38,6 +37,8 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java b/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java index 2e6bd05ce78..47d62f33055 100644 --- a/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java +++ b/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EscapeArtist.java b/Mage.Sets/src/mage/cards/e/EscapeArtist.java index 6709bed0e90..06edf9cf3fc 100644 --- a/Mage.Sets/src/mage/cards/e/EscapeArtist.java +++ b/Mage.Sets/src/mage/cards/e/EscapeArtist.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/e/EscapePod.java b/Mage.Sets/src/mage/cards/e/EscapePod.java index f6c92473200..9b396313b41 100644 --- a/Mage.Sets/src/mage/cards/e/EscapePod.java +++ b/Mage.Sets/src/mage/cards/e/EscapePod.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/EscapeRoutes.java b/Mage.Sets/src/mage/cards/e/EscapeRoutes.java index 6dd4b40e038..5ca5b398636 100644 --- a/Mage.Sets/src/mage/cards/e/EscapeRoutes.java +++ b/Mage.Sets/src/mage/cards/e/EscapeRoutes.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EscapedNull.java b/Mage.Sets/src/mage/cards/e/EscapedNull.java index b58bdba2817..db7230c4fa1 100644 --- a/Mage.Sets/src/mage/cards/e/EscapedNull.java +++ b/Mage.Sets/src/mage/cards/e/EscapedNull.java @@ -27,15 +27,16 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EsperBattlemage.java b/Mage.Sets/src/mage/cards/e/EsperBattlemage.java index 6314f092094..d0387e23561 100644 --- a/Mage.Sets/src/mage/cards/e/EsperBattlemage.java +++ b/Mage.Sets/src/mage/cards/e/EsperBattlemage.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EsperCharm.java b/Mage.Sets/src/mage/cards/e/EsperCharm.java index 3d043ffb540..f49af4ba288 100644 --- a/Mage.Sets/src/mage/cards/e/EsperCharm.java +++ b/Mage.Sets/src/mage/cards/e/EsperCharm.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EsperCormorants.java b/Mage.Sets/src/mage/cards/e/EsperCormorants.java index 575bd698675..40a3e89a610 100644 --- a/Mage.Sets/src/mage/cards/e/EsperCormorants.java +++ b/Mage.Sets/src/mage/cards/e/EsperCormorants.java @@ -28,12 +28,13 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EsperPanorama.java b/Mage.Sets/src/mage/cards/e/EsperPanorama.java index daea98ce29a..702ea7d96c7 100644 --- a/Mage.Sets/src/mage/cards/e/EsperPanorama.java +++ b/Mage.Sets/src/mage/cards/e/EsperPanorama.java @@ -27,10 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +36,9 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EsperSojourners.java b/Mage.Sets/src/mage/cards/e/EsperSojourners.java index 131aef14b5d..5abacd6b02f 100644 --- a/Mage.Sets/src/mage/cards/e/EsperSojourners.java +++ b/Mage.Sets/src/mage/cards/e/EsperSojourners.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EsperStormblade.java b/Mage.Sets/src/mage/cards/e/EsperStormblade.java index f9f1218b1ba..13cf920eb5b 100644 --- a/Mage.Sets/src/mage/cards/e/EsperStormblade.java +++ b/Mage.Sets/src/mage/cards/e/EsperStormblade.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/Esperzoa.java b/Mage.Sets/src/mage/cards/e/Esperzoa.java index 7fb421a5381..deb7151cdaa 100644 --- a/Mage.Sets/src/mage/cards/e/Esperzoa.java +++ b/Mage.Sets/src/mage/cards/e/Esperzoa.java @@ -28,7 +28,6 @@ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledArtifactPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EssenceBacklash.java b/Mage.Sets/src/mage/cards/e/EssenceBacklash.java index 8d6a5d17838..b80368a974c 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceBacklash.java +++ b/Mage.Sets/src/mage/cards/e/EssenceBacklash.java @@ -27,13 +27,11 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -42,6 +40,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EssenceBottle.java b/Mage.Sets/src/mage/cards/e/EssenceBottle.java index 456063e14ea..05b00b8497a 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceBottle.java +++ b/Mage.Sets/src/mage/cards/e/EssenceBottle.java @@ -27,10 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -41,11 +37,16 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EssenceDepleter.java b/Mage.Sets/src/mage/cards/e/EssenceDepleter.java index 94465ff0536..302c291e9b4 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceDepleter.java +++ b/Mage.Sets/src/mage/cards/e/EssenceDepleter.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EssenceDrain.java b/Mage.Sets/src/mage/cards/e/EssenceDrain.java index 4b30b83214a..1651d5e5a84 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceDrain.java +++ b/Mage.Sets/src/mage/cards/e/EssenceDrain.java @@ -28,14 +28,15 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EssenceExtraction.java b/Mage.Sets/src/mage/cards/e/EssenceExtraction.java index 85f37a72152..2f892c454ce 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceExtraction.java +++ b/Mage.Sets/src/mage/cards/e/EssenceExtraction.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EssenceFeed.java b/Mage.Sets/src/mage/cards/e/EssenceFeed.java index 4e01867598f..a8caec60767 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceFeed.java +++ b/Mage.Sets/src/mage/cards/e/EssenceFeed.java @@ -28,16 +28,17 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.EldraziSpawnToken; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EssenceFlux.java b/Mage.Sets/src/mage/cards/e/EssenceFlux.java index 2b226db8572..38dac44b053 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceFlux.java +++ b/Mage.Sets/src/mage/cards/e/EssenceFlux.java @@ -27,18 +27,12 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.cards.CardSetInfo; -import mage.cards.MeldCard; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -51,6 +45,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EssenceFracture.java b/Mage.Sets/src/mage/cards/e/EssenceFracture.java index 6574bd871ac..b55c184ae4c 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceFracture.java +++ b/Mage.Sets/src/mage/cards/e/EssenceFracture.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnToHandTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EssenceHarvest.java b/Mage.Sets/src/mage/cards/e/EssenceHarvest.java index 6170dc32aee..c62848a1deb 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceHarvest.java +++ b/Mage.Sets/src/mage/cards/e/EssenceHarvest.java @@ -27,20 +27,21 @@ */ package mage.cards.e; -import java.util.List; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.List; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java b/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java index 14eb71058c1..3294e93fc8f 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java +++ b/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/e/EssenceScatter.java b/Mage.Sets/src/mage/cards/e/EssenceScatter.java index 9a93b6bca91..d0e00574847 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceScatter.java +++ b/Mage.Sets/src/mage/cards/e/EssenceScatter.java @@ -27,15 +27,16 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EssenceSliver.java b/Mage.Sets/src/mage/cards/e/EssenceSliver.java index e8ae0f55586..e8099040c00 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceSliver.java +++ b/Mage.Sets/src/mage/cards/e/EssenceSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/e/EssenceWarden.java b/Mage.Sets/src/mage/cards/e/EssenceWarden.java index 5cd18d9d9e1..595c76140bc 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceWarden.java +++ b/Mage.Sets/src/mage/cards/e/EssenceWarden.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EtchedChampion.java b/Mage.Sets/src/mage/cards/e/EtchedChampion.java index 65cb1edbb72..290125c692c 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedChampion.java +++ b/Mage.Sets/src/mage/cards/e/EtchedChampion.java @@ -27,10 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -41,10 +37,15 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java b/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java index 3e77550d292..7ff85756379 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java +++ b/Mage.Sets/src/mage/cards/e/EtchedMonstrosity.java @@ -28,9 +28,6 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,10 +38,13 @@ import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EtchedOracle.java b/Mage.Sets/src/mage/cards/e/EtchedOracle.java index 55715d033f7..6c51b1e7f17 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedOracle.java +++ b/Mage.Sets/src/mage/cards/e/EtchedOracle.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,10 +36,13 @@ import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.keyword.SunburstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EternalDominion.java b/Mage.Sets/src/mage/cards/e/EternalDominion.java index 9ae0fd09d98..22290a5d1a3 100644 --- a/Mage.Sets/src/mage/cards/e/EternalDominion.java +++ b/Mage.Sets/src/mage/cards/e/EternalDominion.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.EpicEffect; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EternalDragon.java b/Mage.Sets/src/mage/cards/e/EternalDragon.java index b38595340be..18f2a244e1a 100644 --- a/Mage.Sets/src/mage/cards/e/EternalDragon.java +++ b/Mage.Sets/src/mage/cards/e/EternalDragon.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.condition.common.IsStepCondition; @@ -40,9 +37,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PlainscyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.PhaseStep; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EternalScourge.java b/Mage.Sets/src/mage/cards/e/EternalScourge.java index 85e7fb3a751..7ba4b41714f 100644 --- a/Mage.Sets/src/mage/cards/e/EternalScourge.java +++ b/Mage.Sets/src/mage/cards/e/EternalScourge.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -37,15 +36,13 @@ import mage.abilities.effects.common.ExileSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EternalThirst.java b/Mage.Sets/src/mage/cards/e/EternalThirst.java index dd7d502051e..7d82a0690d0 100644 --- a/Mage.Sets/src/mage/cards/e/EternalThirst.java +++ b/Mage.Sets/src/mage/cards/e/EternalThirst.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,17 +38,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/EternalWarrior.java b/Mage.Sets/src/mage/cards/e/EternalWarrior.java index 5cdae666d70..06762b4bfc9 100644 --- a/Mage.Sets/src/mage/cards/e/EternalWarrior.java +++ b/Mage.Sets/src/mage/cards/e/EternalWarrior.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author icetc diff --git a/Mage.Sets/src/mage/cards/e/EternalWitness.java b/Mage.Sets/src/mage/cards/e/EternalWitness.java index 35b04461f37..8761652717e 100644 --- a/Mage.Sets/src/mage/cards/e/EternalWitness.java +++ b/Mage.Sets/src/mage/cards/e/EternalWitness.java @@ -27,16 +27,17 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/e/EternitySnare.java b/Mage.Sets/src/mage/cards/e/EternitySnare.java index f8e12a42bc8..0ccf287c688 100644 --- a/Mage.Sets/src/mage/cards/e/EternitySnare.java +++ b/Mage.Sets/src/mage/cards/e/EternitySnare.java @@ -27,13 +27,12 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/EternityVessel.java b/Mage.Sets/src/mage/cards/e/EternityVessel.java index 17a29203802..23f694053dd 100644 --- a/Mage.Sets/src/mage/cards/e/EternityVessel.java +++ b/Mage.Sets/src/mage/cards/e/EternityVessel.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.LandfallAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EthercasteKnight.java b/Mage.Sets/src/mage/cards/e/EthercasteKnight.java index cdba67264e6..6fcb65b1bc5 100644 --- a/Mage.Sets/src/mage/cards/e/EthercasteKnight.java +++ b/Mage.Sets/src/mage/cards/e/EthercasteKnight.java @@ -28,12 +28,13 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EtherealAmbush.java b/Mage.Sets/src/mage/cards/e/EtherealAmbush.java index 37066cbb9bc..3264298eeb5 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealAmbush.java +++ b/Mage.Sets/src/mage/cards/e/EtherealAmbush.java @@ -27,12 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.keyword.ManifestEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EtherealArmor.java b/Mage.Sets/src/mage/cards/e/EtherealArmor.java index 6a7a4c7aa1b..4598b796f62 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealArmor.java +++ b/Mage.Sets/src/mage/cards/e/EtherealArmor.java @@ -28,13 +28,6 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -45,12 +38,14 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EtherealChampion.java b/Mage.Sets/src/mage/cards/e/EtherealChampion.java index 592865f1a5a..11676d98a63 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealChampion.java +++ b/Mage.Sets/src/mage/cards/e/EtherealChampion.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/EtherealGuidance.java b/Mage.Sets/src/mage/cards/e/EtherealGuidance.java index 0c395d1abbf..5705c174ef6 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealGuidance.java +++ b/Mage.Sets/src/mage/cards/e/EtherealGuidance.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EtherealHaze.java b/Mage.Sets/src/mage/cards/e/EtherealHaze.java index cb6c1761ac3..d98ec25ca27 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealHaze.java +++ b/Mage.Sets/src/mage/cards/e/EtherealHaze.java @@ -28,14 +28,15 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/e/EtherealUsher.java b/Mage.Sets/src/mage/cards/e/EtherealUsher.java index a7ab9565e0e..8f4fbac06a8 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealUsher.java +++ b/Mage.Sets/src/mage/cards/e/EtherealUsher.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,12 @@ import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.abilities.keyword.TransmuteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java b/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java index 618efa5ebe6..fdbe8508c89 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java +++ b/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EtheriumAbomination.java b/Mage.Sets/src/mage/cards/e/EtheriumAbomination.java index 830c4d15b02..cb010e96569 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumAbomination.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumAbomination.java @@ -28,14 +28,14 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java b/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java index ff003e62db9..39546d96c44 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumAstrolabe.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,11 +36,14 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java b/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java index 96f10e45d76..07b45e9ebd4 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumHornSorcerer.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.CascadeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EtheriumSculptor.java b/Mage.Sets/src/mage/cards/e/EtheriumSculptor.java index 09d88814e44..73018b575f3 100644 --- a/Mage.Sets/src/mage/cards/e/EtheriumSculptor.java +++ b/Mage.Sets/src/mage/cards/e/EtheriumSculptor.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java b/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java index de06b3923d0..bf83f587d7e 100644 --- a/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java +++ b/Mage.Sets/src/mage/cards/e/EtherswornAdjudicator.java @@ -28,9 +28,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,12 +38,16 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java b/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java index 0e51e7d765d..b382fe7608e 100644 --- a/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java +++ b/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -38,16 +35,16 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EtherswornShieldmage.java b/Mage.Sets/src/mage/cards/e/EtherswornShieldmage.java index 4e7a0fab876..83e561e2f6f 100644 --- a/Mage.Sets/src/mage/cards/e/EtherswornShieldmage.java +++ b/Mage.Sets/src/mage/cards/e/EtherswornShieldmage.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.PreventAllDamageToAllEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java b/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java index 89e97b4a084..4fcddef07b1 100644 --- a/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java +++ b/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/Eureka.java b/Mage.Sets/src/mage/cards/e/Eureka.java index 1eff8b4cc44..e3f986c79f9 100644 --- a/Mage.Sets/src/mage/cards/e/Eureka.java +++ b/Mage.Sets/src/mage/cards/e/Eureka.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -43,6 +42,8 @@ import mage.players.PlayerList; import mage.target.Target; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Evacuation.java b/Mage.Sets/src/mage/cards/e/Evacuation.java index b6eed7398d2..aa105b72223 100644 --- a/Mage.Sets/src/mage/cards/e/Evacuation.java +++ b/Mage.Sets/src/mage/cards/e/Evacuation.java @@ -27,14 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; - import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect; -import mage.constants.CardType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java index 16b9a442b2d..0e7865d8a9d 100644 --- a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java +++ b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,15 +38,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EvangelOfHeliod.java b/Mage.Sets/src/mage/cards/e/EvangelOfHeliod.java index 792863e31d2..a8dfb0c0144 100644 --- a/Mage.Sets/src/mage/cards/e/EvangelOfHeliod.java +++ b/Mage.Sets/src/mage/cards/e/EvangelOfHeliod.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.DevotionCount; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.game.permanent.token.SoldierToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Evangelize.java b/Mage.Sets/src/mage/cards/e/Evangelize.java index 74ad62887d9..e2f5a795acc 100644 --- a/Mage.Sets/src/mage/cards/e/Evangelize.java +++ b/Mage.Sets/src/mage/cards/e/Evangelize.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetOpponentsChoicePermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/e/Evaporate.java b/Mage.Sets/src/mage/cards/e/Evaporate.java index d4550efe57f..d61bfeb2be2 100644 --- a/Mage.Sets/src/mage/cards/e/Evaporate.java +++ b/Mage.Sets/src/mage/cards/e/Evaporate.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EvasiveAction.java b/Mage.Sets/src/mage/cards/e/EvasiveAction.java index f271c86d6d0..4f6ea54a71b 100644 --- a/Mage.Sets/src/mage/cards/e/EvasiveAction.java +++ b/Mage.Sets/src/mage/cards/e/EvasiveAction.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/e/EverAfter.java b/Mage.Sets/src/mage/cards/e/EverAfter.java index 6e47955a8e1..1b8c928d2fb 100644 --- a/Mage.Sets/src/mage/cards/e/EverAfter.java +++ b/Mage.Sets/src/mage/cards/e/EverAfter.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -36,15 +34,14 @@ import mage.abilities.effects.common.ReturnToLibrarySpellEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EverbarkShaman.java b/Mage.Sets/src/mage/cards/e/EverbarkShaman.java index 1fb518b3136..f13e85f2e4d 100644 --- a/Mage.Sets/src/mage/cards/e/EverbarkShaman.java +++ b/Mage.Sets/src/mage/cards/e/EverbarkShaman.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +35,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; @@ -45,6 +43,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java index ff3783bb656..63e4ec403ec 100644 --- a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/EverflowingChalice.java b/Mage.Sets/src/mage/cards/e/EverflowingChalice.java index 50b1686ab9b..5ea74c7386d 100644 --- a/Mage.Sets/src/mage/cards/e/EverflowingChalice.java +++ b/Mage.Sets/src/mage/cards/e/EverflowingChalice.java @@ -28,8 +28,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; @@ -39,8 +37,11 @@ import mage.abilities.keyword.MultikickerAbility; import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** diff --git a/Mage.Sets/src/mage/cards/e/Everglades.java b/Mage.Sets/src/mage/cards/e/Everglades.java index cfe8244c2aa..229d740d689 100644 --- a/Mage.Sets/src/mage/cards/e/Everglades.java +++ b/Mage.Sets/src/mage/cards/e/Everglades.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EvergloveCourier.java b/Mage.Sets/src/mage/cards/e/EvergloveCourier.java index b7fb7a09815..e9b82a00d4d 100644 --- a/Mage.Sets/src/mage/cards/e/EvergloveCourier.java +++ b/Mage.Sets/src/mage/cards/e/EvergloveCourier.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EverlastingTorment.java b/Mage.Sets/src/mage/cards/e/EverlastingTorment.java index 322dffbe1a9..257c8402388 100644 --- a/Mage.Sets/src/mage/cards/e/EverlastingTorment.java +++ b/Mage.Sets/src/mage/cards/e/EverlastingTorment.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/Evermind.java b/Mage.Sets/src/mage/cards/e/Evermind.java index 3db9e4015bf..cc7f2b073c4 100644 --- a/Mage.Sets/src/mage/cards/e/Evermind.java +++ b/Mage.Sets/src/mage/cards/e/Evermind.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EvernightShade.java b/Mage.Sets/src/mage/cards/e/EvernightShade.java index aecc2f0ba15..2a3e464b391 100644 --- a/Mage.Sets/src/mage/cards/e/EvernightShade.java +++ b/Mage.Sets/src/mage/cards/e/EvernightShade.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/cards/e/Evershrike.java b/Mage.Sets/src/mage/cards/e/Evershrike.java index 7ad4b32d736..f98efc757a0 100644 --- a/Mage.Sets/src/mage/cards/e/Evershrike.java +++ b/Mage.Sets/src/mage/cards/e/Evershrike.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -55,6 +54,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java index 23f0672c13f..42725c22764 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java index 178b7788b2b..6a5b5d31e86 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EvilPresence.java b/Mage.Sets/src/mage/cards/e/EvilPresence.java index a300f438aff..b37a3370101 100644 --- a/Mage.Sets/src/mage/cards/e/EvilPresence.java +++ b/Mage.Sets/src/mage/cards/e/EvilPresence.java @@ -27,19 +27,20 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BecomesBasicLandEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EvilTwin.java b/Mage.Sets/src/mage/cards/e/EvilTwin.java index 7e9508873ae..14c1201f6b6 100644 --- a/Mage.Sets/src/mage/cards/e/EvilTwin.java +++ b/Mage.Sets/src/mage/cards/e/EvilTwin.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -50,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.util.functions.ApplyToPermanent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/e/EvincarsJustice.java b/Mage.Sets/src/mage/cards/e/EvincarsJustice.java index 8074f7cf7b9..c8caaed0000 100644 --- a/Mage.Sets/src/mage/cards/e/EvincarsJustice.java +++ b/Mage.Sets/src/mage/cards/e/EvincarsJustice.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Eviscerator.java b/Mage.Sets/src/mage/cards/e/Eviscerator.java index ed0b86733f6..c6344a1d8ea 100644 --- a/Mage.Sets/src/mage/cards/e/Eviscerator.java +++ b/Mage.Sets/src/mage/cards/e/Eviscerator.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,6 +34,9 @@ import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EvolutionCharm.java b/Mage.Sets/src/mage/cards/e/EvolutionCharm.java index 9f825e71cbf..d1017cdc413 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionCharm.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -43,6 +42,8 @@ import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EvolutionVat.java b/Mage.Sets/src/mage/cards/e/EvolutionVat.java index b865855e423..18efbf2da87 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionVat.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionVat.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java b/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java index d20c9560633..324d6ee0f99 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/e/EvolutionaryLeap.java b/Mage.Sets/src/mage/cards/e/EvolutionaryLeap.java index 47cdd018f97..52f2a951ca6 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionaryLeap.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionaryLeap.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EvolvingWilds.java b/Mage.Sets/src/mage/cards/e/EvolvingWilds.java index c729ad3533a..de549700b3d 100644 --- a/Mage.Sets/src/mage/cards/e/EvolvingWilds.java +++ b/Mage.Sets/src/mage/cards/e/EvolvingWilds.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/EwokAmbush.java b/Mage.Sets/src/mage/cards/e/EwokAmbush.java index 4834f143b78..55e94ae3a43 100644 --- a/Mage.Sets/src/mage/cards/e/EwokAmbush.java +++ b/Mage.Sets/src/mage/cards/e/EwokAmbush.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -45,6 +44,8 @@ import mage.game.permanent.token.EwokToken; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/EwokFiredancers.java b/Mage.Sets/src/mage/cards/e/EwokFiredancers.java index e930c67b1d7..51956c6da5a 100644 --- a/Mage.Sets/src/mage/cards/e/EwokFiredancers.java +++ b/Mage.Sets/src/mage/cards/e/EwokFiredancers.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/EwokVillage.java b/Mage.Sets/src/mage/cards/e/EwokVillage.java index 9b2c54729f3..feb9b61aff4 100644 --- a/Mage.Sets/src/mage/cards/e/EwokVillage.java +++ b/Mage.Sets/src/mage/cards/e/EwokVillage.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/ExaltedAngel.java b/Mage.Sets/src/mage/cards/e/ExaltedAngel.java index dba3fb7a9ab..47fc7f0c317 100644 --- a/Mage.Sets/src/mage/cards/e/ExaltedAngel.java +++ b/Mage.Sets/src/mage/cards/e/ExaltedAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageGainLifeSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ExaltedDragon.java b/Mage.Sets/src/mage/cards/e/ExaltedDragon.java index d0029ddaad9..061c83ebb32 100644 --- a/Mage.Sets/src/mage/cards/e/ExaltedDragon.java +++ b/Mage.Sets/src/mage/cards/e/ExaltedDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java index 7fd1e7cb37b..9cb8fedfcc3 100644 --- a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java +++ b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java @@ -27,11 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -40,7 +35,7 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.TargetController; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -48,6 +43,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -65,7 +62,7 @@ public class ExavaRakdosBloodWitch extends CardImpl { static final String rule = "Each other creature you control with a +1/+1 counter on it has haste"; public ExavaRakdosBloodWitch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/e/Excavation.java b/Mage.Sets/src/mage/cards/e/Excavation.java index 64548bb255a..0407a4e2453 100644 --- a/Mage.Sets/src/mage/cards/e/Excavation.java +++ b/Mage.Sets/src/mage/cards/e/Excavation.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Excavator.java b/Mage.Sets/src/mage/cards/e/Excavator.java index 818f42ebc6c..1ebe3370173 100644 --- a/Mage.Sets/src/mage/cards/e/Excavator.java +++ b/Mage.Sets/src/mage/cards/e/Excavator.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; @@ -37,19 +36,10 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.SourceEffect; -import mage.abilities.keyword.ForestwalkAbility; -import mage.abilities.keyword.IslandwalkAbility; -import mage.abilities.keyword.MountainwalkAbility; -import mage.abilities.keyword.PlainswalkAbility; -import mage.abilities.keyword.SwampwalkAbility; +import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; @@ -57,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman @@ -66,7 +58,7 @@ public class Excavator extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("basic land"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public Excavator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Exclude.java b/Mage.Sets/src/mage/cards/e/Exclude.java index 67fc3dd8ec8..ef6b610d070 100644 --- a/Mage.Sets/src/mage/cards/e/Exclude.java +++ b/Mage.Sets/src/mage/cards/e/Exclude.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureSpell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java index ba5b6c58346..78ebf829ee4 100644 --- a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java +++ b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -36,7 +35,10 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -46,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/e/Excommunicate.java b/Mage.Sets/src/mage/cards/e/Excommunicate.java index 161d7cf9aaa..5edd202f4d1 100644 --- a/Mage.Sets/src/mage/cards/e/Excommunicate.java +++ b/Mage.Sets/src/mage/cards/e/Excommunicate.java @@ -28,13 +28,14 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/e/Excoriate.java b/Mage.Sets/src/mage/cards/e/Excoriate.java index 18fca88b2eb..ef128eb18e5 100644 --- a/Mage.Sets/src/mage/cards/e/Excoriate.java +++ b/Mage.Sets/src/mage/cards/e/Excoriate.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Execute.java b/Mage.Sets/src/mage/cards/e/Execute.java index 946c1385346..3d911ef78d2 100644 --- a/Mage.Sets/src/mage/cards/e/Execute.java +++ b/Mage.Sets/src/mage/cards/e/Execute.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java b/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java index 5c9aa9de8a9..59c92ad19c6 100644 --- a/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java +++ b/Mage.Sets/src/mage/cards/e/ExecutionersCapsule.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,11 +35,15 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ExecutionersHood.java b/Mage.Sets/src/mage/cards/e/ExecutionersHood.java index 5702875a918..dfd60957fa9 100644 --- a/Mage.Sets/src/mage/cards/e/ExecutionersHood.java +++ b/Mage.Sets/src/mage/cards/e/ExecutionersHood.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -37,6 +34,12 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ExertInfluence.java b/Mage.Sets/src/mage/cards/e/ExertInfluence.java index 7ce80344625..21813390f71 100644 --- a/Mage.Sets/src/mage/cards/e/ExertInfluence.java +++ b/Mage.Sets/src/mage/cards/e/ExertInfluence.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.ColorsOfManaSpentToCastCount; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Exhaustion.java b/Mage.Sets/src/mage/cards/e/Exhaustion.java index b28930afe66..99e55f8677f 100644 --- a/Mage.Sets/src/mage/cards/e/Exhaustion.java +++ b/Mage.Sets/src/mage/cards/e/Exhaustion.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/e/Exhume.java b/Mage.Sets/src/mage/cards/e/Exhume.java index 678d17dddcb..29541c810e9 100644 --- a/Mage.Sets/src/mage/cards/e/Exhume.java +++ b/Mage.Sets/src/mage/cards/e/Exhume.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ExhumerThrull.java b/Mage.Sets/src/mage/cards/e/ExhumerThrull.java index 2f0a23a25e4..67e8c10fe4b 100644 --- a/Mage.Sets/src/mage/cards/e/ExhumerThrull.java +++ b/Mage.Sets/src/mage/cards/e/ExhumerThrull.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Exile.java b/Mage.Sets/src/mage/cards/e/Exile.java index 1c6a4a72c06..bcfb17d3709 100644 --- a/Mage.Sets/src/mage/cards/e/Exile.java +++ b/Mage.Sets/src/mage/cards/e/Exile.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/e/ExileIntoDarkness.java b/Mage.Sets/src/mage/cards/e/ExileIntoDarkness.java index bda58c84b60..e81d976d4df 100644 --- a/Mage.Sets/src/mage/cards/e/ExileIntoDarkness.java +++ b/Mage.Sets/src/mage/cards/e/ExileIntoDarkness.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.MoreCardsInHandThanOpponentsCondition; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ExiledBoggart.java b/Mage.Sets/src/mage/cards/e/ExiledBoggart.java index 1f8d6705615..0cad849ad56 100644 --- a/Mage.Sets/src/mage/cards/e/ExiledBoggart.java +++ b/Mage.Sets/src/mage/cards/e/ExiledBoggart.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.discard.DiscardControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/e/Exogorth.java b/Mage.Sets/src/mage/cards/e/Exogorth.java index e03effdb47b..7bd320408c8 100644 --- a/Mage.Sets/src/mage/cards/e/Exogorth.java +++ b/Mage.Sets/src/mage/cards/e/Exogorth.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/Exorcist.java b/Mage.Sets/src/mage/cards/e/Exorcist.java index 0d4e38424e9..d7c9180eb4b 100644 --- a/Mage.Sets/src/mage/cards/e/Exorcist.java +++ b/Mage.Sets/src/mage/cards/e/Exorcist.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java index 2b1032f5adb..3f743e36e5e 100644 --- a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java +++ b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreatureCard; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ExoticCurse.java b/Mage.Sets/src/mage/cards/e/ExoticCurse.java index 542e03dc67d..83005d3b3b4 100644 --- a/Mage.Sets/src/mage/cards/e/ExoticCurse.java +++ b/Mage.Sets/src/mage/cards/e/ExoticCurse.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.DomainValue; @@ -43,6 +42,8 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/e/ExoticDisease.java b/Mage.Sets/src/mage/cards/e/ExoticDisease.java index 9831ff5fc28..2691ef23fc4 100644 --- a/Mage.Sets/src/mage/cards/e/ExoticDisease.java +++ b/Mage.Sets/src/mage/cards/e/ExoticDisease.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ExoticOrchard.java b/Mage.Sets/src/mage/cards/e/ExoticOrchard.java index cb42745e190..b9c62ee97be 100644 --- a/Mage.Sets/src/mage/cards/e/ExoticOrchard.java +++ b/Mage.Sets/src/mage/cards/e/ExoticOrchard.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.mana.AnyColorLandsProduceManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Expedite.java b/Mage.Sets/src/mage/cards/e/Expedite.java index b86123ea5da..7c5dfcc3da3 100644 --- a/Mage.Sets/src/mage/cards/e/Expedite.java +++ b/Mage.Sets/src/mage/cards/e/Expedite.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionEnvoy.java b/Mage.Sets/src/mage/cards/e/ExpeditionEnvoy.java index 3528bb86df8..d2c98b2e920 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionEnvoy.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionEnvoy.java @@ -27,12 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionMap.java b/Mage.Sets/src/mage/cards/e/ExpeditionMap.java index 2b853b68779..32bd908dea8 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionMap.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionMap.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -37,9 +34,13 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionRaptor.java b/Mage.Sets/src/mage/cards/e/ExpeditionRaptor.java index 57815ca96da..a7207ba15fe 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionRaptor.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionRaptor.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SupportAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ExpendableTroops.java b/Mage.Sets/src/mage/cards/e/ExpendableTroops.java index 4f089cda877..a54b6f565f6 100644 --- a/Mage.Sets/src/mage/cards/e/ExpendableTroops.java +++ b/Mage.Sets/src/mage/cards/e/ExpendableTroops.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,13 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java index 812470fa774..1e9bdcc6502 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java @@ -27,13 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -44,6 +37,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -52,6 +46,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +56,7 @@ public class ExperimentKraj extends CardImpl { public ExperimentKraj(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ooze"); this.subtype.add("Mutant"); diff --git a/Mage.Sets/src/mage/cards/e/ExperimentOne.java b/Mage.Sets/src/mage/cards/e/ExperimentOne.java index 97a8052eed8..2a77c9ee671 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentOne.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentOne.java @@ -28,9 +28,6 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/ExperimentalAviator.java b/Mage.Sets/src/mage/cards/e/ExperimentalAviator.java index 8efd48544bf..c87f4d28d32 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentalAviator.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentalAviator.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ThopterColorlessToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ExplodingBorders.java b/Mage.Sets/src/mage/cards/e/ExplodingBorders.java index 95413437f7f..6453e2b0c52 100644 --- a/Mage.Sets/src/mage/cards/e/ExplodingBorders.java +++ b/Mage.Sets/src/mage/cards/e/ExplodingBorders.java @@ -27,17 +27,18 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/Exploration.java b/Mage.Sets/src/mage/cards/e/Exploration.java index 024109007fd..2cad0c507f2 100644 --- a/Mage.Sets/src/mage/cards/e/Exploration.java +++ b/Mage.Sets/src/mage/cards/e/Exploration.java @@ -27,14 +27,15 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.PlayAdditionalLandsControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/Explore.java b/Mage.Sets/src/mage/cards/e/Explore.java index 2400a95ee60..8c6e8639c57 100644 --- a/Mage.Sets/src/mage/cards/e/Explore.java +++ b/Mage.Sets/src/mage/cards/e/Explore.java @@ -28,14 +28,14 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.PlayAdditionalLandsControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/ExplorersScope.java b/Mage.Sets/src/mage/cards/e/ExplorersScope.java index 58c79d9f4c6..1c492cd64a7 100644 --- a/Mage.Sets/src/mage/cards/e/ExplorersScope.java +++ b/Mage.Sets/src/mage/cards/e/ExplorersScope.java @@ -27,24 +27,21 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AttacksAttachedTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.EquipAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java b/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java index dfe7e31cbc6..0913ae75e17 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveGrowth.java b/Mage.Sets/src/mage/cards/e/ExplosiveGrowth.java index 747905ea166..a69e93407c5 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveGrowth.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveGrowth.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java b/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java index 806c7e4e0ec..93a42f7bdfe 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java @@ -28,13 +28,14 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java index 3bbb3fceae9..f91d9378f84 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java @@ -27,15 +27,13 @@ */ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; @@ -44,6 +42,8 @@ import mage.players.Library; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveVegetation.java b/Mage.Sets/src/mage/cards/e/ExplosiveVegetation.java index 96d9fcb4807..34bf4ee97f7 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveVegetation.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveVegetation.java @@ -27,14 +27,15 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/ExposeEvil.java b/Mage.Sets/src/mage/cards/e/ExposeEvil.java index 4f91e406953..76f5be6edbf 100644 --- a/Mage.Sets/src/mage/cards/e/ExposeEvil.java +++ b/Mage.Sets/src/mage/cards/e/ExposeEvil.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.keyword.InvestigateEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Expunge.java b/Mage.Sets/src/mage/cards/e/Expunge.java index 5952d8e7274..70bc63588e7 100644 --- a/Mage.Sets/src/mage/cards/e/Expunge.java +++ b/Mage.Sets/src/mage/cards/e/Expunge.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java b/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java index 1316ae4d069..3c99ef208b8 100644 --- a/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java +++ b/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/e/ExquisiteBlood.java b/Mage.Sets/src/mage/cards/e/ExquisiteBlood.java index 0b730f72d35..8ded2c85115 100644 --- a/Mage.Sets/src/mage/cards/e/ExquisiteBlood.java +++ b/Mage.Sets/src/mage/cards/e/ExquisiteBlood.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java b/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java index 4bff2b57bbb..14b6e849488 100644 --- a/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java +++ b/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SpellMasteryCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Exsanguinate.java b/Mage.Sets/src/mage/cards/e/Exsanguinate.java index 0e46a912109..13e98616ef0 100644 --- a/Mage.Sets/src/mage/cards/e/Exsanguinate.java +++ b/Mage.Sets/src/mage/cards/e/Exsanguinate.java @@ -28,16 +28,16 @@ package mage.cards.e; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/Extinction.java b/Mage.Sets/src/mage/cards/e/Extinction.java index 182fada44da..4d0739cbc10 100644 --- a/Mage.Sets/src/mage/cards/e/Extinction.java +++ b/Mage.Sets/src/mage/cards/e/Extinction.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/Extinguish.java b/Mage.Sets/src/mage/cards/e/Extinguish.java index 5f414ece10d..bd02263e26e 100644 --- a/Mage.Sets/src/mage/cards/e/Extinguish.java +++ b/Mage.Sets/src/mage/cards/e/Extinguish.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/ExtinguishAllHope.java b/Mage.Sets/src/mage/cards/e/ExtinguishAllHope.java index 74dd6ae02d9..0ee89633881 100644 --- a/Mage.Sets/src/mage/cards/e/ExtinguishAllHope.java +++ b/Mage.Sets/src/mage/cards/e/ExtinguishAllHope.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Extirpate.java b/Mage.Sets/src/mage/cards/e/Extirpate.java index a92c632b493..5386139aff0 100644 --- a/Mage.Sets/src/mage/cards/e/Extirpate.java +++ b/Mage.Sets/src/mage/cards/e/Extirpate.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.List; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -38,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -50,6 +49,9 @@ import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInLibrary; +import java.util.List; +import java.util.UUID; + /** * * @author jonubuu @@ -59,7 +61,7 @@ public class Extirpate extends CardImpl { private static final FilterCard filter = new FilterCard("card in a graveyard other than a basic land card"); static { - filter.add(Predicates.not(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate("Basic")))); + filter.add(Predicates.not(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate(SuperType.BASIC)))); } public Extirpate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ExtraArms.java b/Mage.Sets/src/mage/cards/e/ExtraArms.java index 86c03053ee6..82ab2776806 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraArms.java +++ b/Mage.Sets/src/mage/cards/e/ExtraArms.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/Extract.java b/Mage.Sets/src/mage/cards/e/Extract.java index e479aa82daf..713e4a128c8 100644 --- a/Mage.Sets/src/mage/cards/e/Extract.java +++ b/Mage.Sets/src/mage/cards/e/Extract.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -42,6 +41,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author cbt33, jeffwadsworth (Supreme Inquisitor) diff --git a/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java b/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java index 25c170efa4a..c3cf7d2ef11 100644 --- a/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java +++ b/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java index c86208519dc..a87f06cef1c 100644 --- a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java +++ b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldAllTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java index 734e4736ed2..b54ede58f81 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java +++ b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; @@ -50,6 +49,8 @@ import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java index bc573a9c0dc..5c8ce724d8a 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.EldraziHorrorToken; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java index ee80a4ba15c..0324c9abe8e 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.EldraziHorrorToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/Extruder.java b/Mage.Sets/src/mage/cards/e/Extruder.java index 77c6b5de260..099d773e3be 100644 --- a/Mage.Sets/src/mage/cards/e/Extruder.java +++ b/Mage.Sets/src/mage/cards/e/Extruder.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,12 +35,16 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/e/ExuberantFirestoker.java b/Mage.Sets/src/mage/cards/e/ExuberantFirestoker.java index e9f69a49416..2418097e9e9 100644 --- a/Mage.Sets/src/mage/cards/e/ExuberantFirestoker.java +++ b/Mage.Sets/src/mage/cards/e/ExuberantFirestoker.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DamageTargetEffect; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/ExultantCultist.java b/Mage.Sets/src/mage/cards/e/ExultantCultist.java index 674b96b02c2..5750c9204cf 100644 --- a/Mage.Sets/src/mage/cards/e/ExultantCultist.java +++ b/Mage.Sets/src/mage/cards/e/ExultantCultist.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EyeForAnEye.java b/Mage.Sets/src/mage/cards/e/EyeForAnEye.java index 08245b25ab3..ab8fe3a43dd 100644 --- a/Mage.Sets/src/mage/cards/e/EyeForAnEye.java +++ b/Mage.Sets/src/mage/cards/e/EyeForAnEye.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/e/EyeGouge.java b/Mage.Sets/src/mage/cards/e/EyeGouge.java index 06b45b2d729..ed6746ec023 100644 --- a/Mage.Sets/src/mage/cards/e/EyeGouge.java +++ b/Mage.Sets/src/mage/cards/e/EyeGouge.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.condition.common.TargetHasSubtypeCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EyeOfDoom.java b/Mage.Sets/src/mage/cards/e/EyeOfDoom.java index 6a665a99c2e..e904668256e 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfDoom.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfDoom.java @@ -27,9 +27,6 @@ */ package mage.cards.e; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -53,6 +50,10 @@ import mage.players.PlayerList; import mage.target.Target; import mage.target.common.TargetNonlandPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EyeOfNowhere.java b/Mage.Sets/src/mage/cards/e/EyeOfNowhere.java index f598186bc3a..60973439537 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfNowhere.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfNowhere.java @@ -28,13 +28,14 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/e/EyeOfRamos.java b/Mage.Sets/src/mage/cards/e/EyeOfRamos.java index 0cf2f5554c0..88c81742a99 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfRamos.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfRamos.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.Mana; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.BlueManaAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Jgod diff --git a/Mage.Sets/src/mage/cards/e/EyeOfSingularity.java b/Mage.Sets/src/mage/cards/e/EyeOfSingularity.java index d48d4a71b5c..8efa1c92ee7 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfSingularity.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfSingularity.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -58,7 +59,7 @@ public class EyeOfSingularity extends CardImpl { public EyeOfSingularity(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); - this.supertype.add("World"); + this.addSuperType(SuperType.WORLD); // When Eye of Singularity enters the battlefield, destroy each permanent with the same name as another permanent, except for basic lands. They can't be regenerated. this.addAbility(new EntersBattlefieldTriggeredAbility(new EyeOfSingularityETBEffect())); @@ -152,7 +153,7 @@ class EyeOfSingularityTriggeredAbility extends TriggeredAbilityImpl { return false; } - if (permanent != null && !permanent.getSupertype().contains("Basic")) { + if (permanent != null && !permanent.isBasic()) { getEffects().get(0).setTargetPointer(new FixedTarget(event.getTargetId())); return true; } diff --git a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java index 0d194be04b5..ffdd8f80651 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java @@ -27,16 +27,11 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.CardsImpl; -import mage.cards.SplitCard; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -55,6 +50,8 @@ import mage.target.TargetCard; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java index f89a3f8e604..850ac9e1ee5 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java @@ -28,9 +28,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,14 +37,18 @@ import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** - * * @author maurer.it_at_gmail.com */ public class EyeOfUgin extends CardImpl { @@ -61,9 +62,9 @@ public class EyeOfUgin extends CardImpl { filterSpells.add(new SubtypePredicate("Eldrazi")); } - public EyeOfUgin (UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},null); - this.supertype.add("Legendary"); + public EyeOfUgin(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.LAND}, null); + addSuperType(SuperType.LEGENDARY); // Colorless Eldrazi spells you cast cost {2} less to cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterSpells, 2))); @@ -75,7 +76,7 @@ public class EyeOfUgin extends CardImpl { this.addAbility(searchAbility); } - public EyeOfUgin (final EyeOfUgin card) { + public EyeOfUgin(final EyeOfUgin card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/e/EyeSpy.java b/Mage.Sets/src/mage/cards/e/EyeSpy.java index eaafe553cb8..3c0f21602bf 100644 --- a/Mage.Sets/src/mage/cards/e/EyeSpy.java +++ b/Mage.Sets/src/mage/cards/e/EyeSpy.java @@ -27,13 +27,14 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.LookLibraryTopCardTargetPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EyeblightAssassin.java b/Mage.Sets/src/mage/cards/e/EyeblightAssassin.java index 63f78f0f4f4..86fd64e0968 100644 --- a/Mage.Sets/src/mage/cards/e/EyeblightAssassin.java +++ b/Mage.Sets/src/mage/cards/e/EyeblightAssassin.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/e/EyeblightMassacre.java b/Mage.Sets/src/mage/cards/e/EyeblightMassacre.java index 5d985d6a7e0..5ab768fb84a 100644 --- a/Mage.Sets/src/mage/cards/e/EyeblightMassacre.java +++ b/Mage.Sets/src/mage/cards/e/EyeblightMassacre.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java b/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java index 7bde5b5cd23..024efef4ed7 100644 --- a/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java +++ b/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java @@ -27,10 +27,10 @@ */ package mage.cards.e; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/cards/e/EyelessWatcher.java b/Mage.Sets/src/mage/cards/e/EyelessWatcher.java index d7f1ea1d626..235a8265144 100644 --- a/Mage.Sets/src/mage/cards/e/EyelessWatcher.java +++ b/Mage.Sets/src/mage/cards/e/EyelessWatcher.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.EldraziScionToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EyesInTheSkies.java b/Mage.Sets/src/mage/cards/e/EyesInTheSkies.java index 9911a3f6bec..b53df83e213 100644 --- a/Mage.Sets/src/mage/cards/e/EyesInTheSkies.java +++ b/Mage.Sets/src/mage/cards/e/EyesInTheSkies.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.BirdToken; +import java.util.UUID; + /** * * @author LevleX2 diff --git a/Mage.Sets/src/mage/cards/e/EyesOfTheWatcher.java b/Mage.Sets/src/mage/cards/e/EyesOfTheWatcher.java index c613bf46c45..5e7f2f151a5 100644 --- a/Mage.Sets/src/mage/cards/e/EyesOfTheWatcher.java +++ b/Mage.Sets/src/mage/cards/e/EyesOfTheWatcher.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DoIfCostPaid; @@ -39,6 +38,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java b/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java index 2dcebd98b02..dc8d4c446a0 100644 --- a/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java +++ b/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastOpponentTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java b/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java index 1aee5113fc1..19810ba9a65 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java +++ b/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -36,10 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.Filter; import mage.filter.common.FilterControlledCreaturePermanent; @@ -50,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -68,7 +66,7 @@ public class EzuriClawOfProgress extends CardImpl { public EzuriClawOfProgress(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java index 87d81aa5d0d..cfb039a5588 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java @@ -27,10 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +37,10 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -48,6 +48,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com @@ -66,7 +68,7 @@ public class EzuriRenegadeLeader extends CardImpl { public EzuriRenegadeLeader(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/e/EzurisArchers.java b/Mage.Sets/src/mage/cards/e/EzurisArchers.java index 8c7daa9573c..caf38e0e1e2 100644 --- a/Mage.Sets/src/mage/cards/e/EzurisArchers.java +++ b/Mage.Sets/src/mage/cards/e/EzurisArchers.java @@ -27,7 +27,6 @@ */ package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java index 4a964c74594..c53bf121aad 100644 --- a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java +++ b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java @@ -28,10 +28,6 @@ package mage.cards.e; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +39,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/e/EzurisPredation.java b/Mage.Sets/src/mage/cards/e/EzurisPredation.java index 511a65d27e2..b92bfed0553 100644 --- a/Mage.Sets/src/mage/cards/e/EzurisPredation.java +++ b/Mage.Sets/src/mage/cards/e/EzurisPredation.java @@ -27,8 +27,6 @@ */ package mage.cards.e; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -44,6 +42,9 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.BeastToken2; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java b/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java index 6cbe2cda0e2..383f6f5631b 100644 --- a/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java +++ b/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FableOfWolfAndOwl.java b/Mage.Sets/src/mage/cards/f/FableOfWolfAndOwl.java index ee4c4184e0b..f041edfb2f6 100644 --- a/Mage.Sets/src/mage/cards/f/FableOfWolfAndOwl.java +++ b/Mage.Sets/src/mage/cards/f/FableOfWolfAndOwl.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -36,11 +34,14 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.permanent.token.Token; import mage.game.permanent.token.WolfToken; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/f/FabledHero.java b/Mage.Sets/src/mage/cards/f/FabledHero.java index 811f78c9d1e..cd7b461f8c8 100644 --- a/Mage.Sets/src/mage/cards/f/FabledHero.java +++ b/Mage.Sets/src/mage/cards/f/FabledHero.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Fabricate.java b/Mage.Sets/src/mage/cards/f/Fabricate.java index 2fa9cdaedcd..473601679a3 100644 --- a/Mage.Sets/src/mage/cards/f/Fabricate.java +++ b/Mage.Sets/src/mage/cards/f/Fabricate.java @@ -27,15 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FabricationModule.java b/Mage.Sets/src/mage/cards/f/FabricationModule.java index b19ee5d8313..b2c3d911def 100644 --- a/Mage.Sets/src/mage/cards/f/FabricationModule.java +++ b/Mage.Sets/src/mage/cards/f/FabricationModule.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +43,9 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.Objects; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FaceOfFear.java b/Mage.Sets/src/mage/cards/f/FaceOfFear.java index abda3cf9477..002bb740490 100644 --- a/Mage.Sets/src/mage/cards/f/FaceOfFear.java +++ b/Mage.Sets/src/mage/cards/f/FaceOfFear.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/f/FacelessButcher.java b/Mage.Sets/src/mage/cards/f/FacelessButcher.java index ce77fdb1428..f9d2c51fbfb 100644 --- a/Mage.Sets/src/mage/cards/f/FacelessButcher.java +++ b/Mage.Sets/src/mage/cards/f/FacelessButcher.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/f/FacelessDevourer.java b/Mage.Sets/src/mage/cards/f/FacelessDevourer.java index a6d28d271b9..6f3212e14d9 100644 --- a/Mage.Sets/src/mage/cards/f/FacelessDevourer.java +++ b/Mage.Sets/src/mage/cards/f/FacelessDevourer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Facevaulter.java b/Mage.Sets/src/mage/cards/f/Facevaulter.java index 0d57abb36bf..7ddfd2a35cb 100644 --- a/Mage.Sets/src/mage/cards/f/Facevaulter.java +++ b/Mage.Sets/src/mage/cards/f/Facevaulter.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -36,6 +35,10 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/f/FactOrFiction.java b/Mage.Sets/src/mage/cards/f/FactOrFiction.java index da45ca20222..44a464980a3 100644 --- a/Mage.Sets/src/mage/cards/f/FactOrFiction.java +++ b/Mage.Sets/src/mage/cards/f/FactOrFiction.java @@ -27,27 +27,23 @@ */ package mage.cards.f; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.UUID; - import mage.MageObject; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; -import mage.abilities.Ability; -import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.UUID; + /** * @author North */ diff --git a/Mage.Sets/src/mage/cards/f/FadeAway.java b/Mage.Sets/src/mage/cards/f/FadeAway.java index db13d528c86..ea5249919ec 100644 --- a/Mage.Sets/src/mage/cards/f/FadeAway.java +++ b/Mage.Sets/src/mage/cards/f/FadeAway.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FadeFromMemory.java b/Mage.Sets/src/mage/cards/f/FadeFromMemory.java index a77aad3766d..98d862a2617 100644 --- a/Mage.Sets/src/mage/cards/f/FadeFromMemory.java +++ b/Mage.Sets/src/mage/cards/f/FadeFromMemory.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.CyclingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/f/FadeIntoAntiquity.java b/Mage.Sets/src/mage/cards/f/FadeIntoAntiquity.java index 8675238f6b5..eafd548d039 100644 --- a/Mage.Sets/src/mage/cards/f/FadeIntoAntiquity.java +++ b/Mage.Sets/src/mage/cards/f/FadeIntoAntiquity.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FaerieArtisans.java b/Mage.Sets/src/mage/cards/f/FaerieArtisans.java index 80a433d0fbe..8537f3fd544 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieArtisans.java +++ b/Mage.Sets/src/mage/cards/f/FaerieArtisans.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.StringTokenizer; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -39,11 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerPredicate; @@ -53,6 +47,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.StringTokenizer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FaerieConclave.java b/Mage.Sets/src/mage/cards/f/FaerieConclave.java index 8fabff81a51..68d7281839b 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieConclave.java +++ b/Mage.Sets/src/mage/cards/f/FaerieConclave.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,9 +36,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FaerieHarbinger.java b/Mage.Sets/src/mage/cards/f/FaerieHarbinger.java index 6267dc11eee..1b0be4f318e 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieHarbinger.java +++ b/Mage.Sets/src/mage/cards/f/FaerieHarbinger.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; @@ -40,6 +39,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FaerieImpostor.java b/Mage.Sets/src/mage/cards/f/FaerieImpostor.java index 8a13e52649f..f918b79883e 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieImpostor.java +++ b/Mage.Sets/src/mage/cards/f/FaerieImpostor.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FaerieInvaders.java b/Mage.Sets/src/mage/cards/f/FaerieInvaders.java index f571cdfefa8..94548838d88 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieInvaders.java +++ b/Mage.Sets/src/mage/cards/f/FaerieInvaders.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FaerieMacabre.java b/Mage.Sets/src/mage/cards/f/FaerieMacabre.java index 5017cb5e365..51909bad25f 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieMacabre.java +++ b/Mage.Sets/src/mage/cards/f/FaerieMacabre.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -40,12 +37,15 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FaerieMechanist.java b/Mage.Sets/src/mage/cards/f/FaerieMechanist.java index f84a02c16bc..a07e1e726f4 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieMechanist.java +++ b/Mage.Sets/src/mage/cards/f/FaerieMechanist.java @@ -28,8 +28,6 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; @@ -37,9 +35,12 @@ import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java b/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java index 49d8adcbcae..aa3e9a37e0a 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java +++ b/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FaerieNoble.java b/Mage.Sets/src/mage/cards/f/FaerieNoble.java index b20f02fe0ce..31be97e7cd0 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieNoble.java +++ b/Mage.Sets/src/mage/cards/f/FaerieNoble.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/f/FaerieSquadron.java b/Mage.Sets/src/mage/cards/f/FaerieSquadron.java index 4a4310fc09f..98f8c35da8d 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieSquadron.java +++ b/Mage.Sets/src/mage/cards/f/FaerieSquadron.java @@ -28,7 +28,6 @@ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FaerieSwarm.java b/Mage.Sets/src/mage/cards/f/FaerieSwarm.java index 241eac2d456..82f314cb97c 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieSwarm.java +++ b/Mage.Sets/src/mage/cards/f/FaerieSwarm.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -39,9 +35,14 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FaerieTauntings.java b/Mage.Sets/src/mage/cards/f/FaerieTauntings.java index 96d8db2c69a..790e95eedb6 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieTauntings.java +++ b/Mage.Sets/src/mage/cards/f/FaerieTauntings.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.condition.common.OnOpponentsTurnCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FaerieTrickery.java b/Mage.Sets/src/mage/cards/f/FaerieTrickery.java index a930c53f9de..e548746e979 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieTrickery.java +++ b/Mage.Sets/src/mage/cards/f/FaerieTrickery.java @@ -27,17 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FailedInspection.java b/Mage.Sets/src/mage/cards/f/FailedInspection.java index c623d48a459..def2cbd2332 100644 --- a/Mage.Sets/src/mage/cards/f/FailedInspection.java +++ b/Mage.Sets/src/mage/cards/f/FailedInspection.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FairgroundsTrumpeter.java b/Mage.Sets/src/mage/cards/f/FairgroundsTrumpeter.java index e0fcb44c3da..803f7400867 100644 --- a/Mage.Sets/src/mage/cards/f/FairgroundsTrumpeter.java +++ b/Mage.Sets/src/mage/cards/f/FairgroundsTrumpeter.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -47,6 +44,10 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java b/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java index 1d8cc995296..27b62974c28 100644 --- a/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java +++ b/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FaithHealer.java b/Mage.Sets/src/mage/cards/f/FaithHealer.java index 4e9f8318083..f14c47d21aa 100644 --- a/Mage.Sets/src/mage/cards/f/FaithHealer.java +++ b/Mage.Sets/src/mage/cards/f/FaithHealer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FaithUnbroken.java b/Mage.Sets/src/mage/cards/f/FaithUnbroken.java index ab3642a8b40..a18f3273f73 100644 --- a/Mage.Sets/src/mage/cards/f/FaithUnbroken.java +++ b/Mage.Sets/src/mage/cards/f/FaithUnbroken.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,11 +39,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.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -54,6 +49,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FaithbearerPaladin.java b/Mage.Sets/src/mage/cards/f/FaithbearerPaladin.java index 8514f662f0f..9717cdff5c8 100644 --- a/Mage.Sets/src/mage/cards/f/FaithbearerPaladin.java +++ b/Mage.Sets/src/mage/cards/f/FaithbearerPaladin.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FaithfulSquire.java b/Mage.Sets/src/mage/cards/f/FaithfulSquire.java index 989a3ad6745..81a9861f59f 100644 --- a/Mage.Sets/src/mage/cards/f/FaithfulSquire.java +++ b/Mage.Sets/src/mage/cards/f/FaithfulSquire.java @@ -29,7 +29,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -46,6 +45,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -53,6 +53,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author LevelX2 */ @@ -95,7 +97,7 @@ class KaisoMemoryOfLoyalty extends Token { KaisoMemoryOfLoyalty() { super("Kaiso, Memory of Loyalty", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/f/FaithlessLooting.java b/Mage.Sets/src/mage/cards/f/FaithlessLooting.java index 97d422e5117..8d2ee98b29e 100644 --- a/Mage.Sets/src/mage/cards/f/FaithlessLooting.java +++ b/Mage.Sets/src/mage/cards/f/FaithlessLooting.java @@ -27,16 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FaithsFetters.java b/Mage.Sets/src/mage/cards/f/FaithsFetters.java index 60c7a1618cc..6e0713642d4 100644 --- a/Mage.Sets/src/mage/cards/f/FaithsFetters.java +++ b/Mage.Sets/src/mage/cards/f/FaithsFetters.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,17 +38,14 @@ import mage.abilities.effects.common.combat.CantAttackBlockAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityType; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FaithsShield.java b/Mage.Sets/src/mage/cards/f/FaithsShield.java index 1d290833c48..d4098199fab 100644 --- a/Mage.Sets/src/mage/cards/f/FaithsShield.java +++ b/Mage.Sets/src/mage/cards/f/FaithsShield.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.effects.OneShotEffect; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java b/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java index cda6109e116..89cc8def475 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java b/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java index 24e3ea4f0a0..44679af85b2 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,10 +37,13 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java index 0e97f7dd144..b7b6afabd21 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.HashMap; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -37,17 +35,15 @@ import mage.abilities.keyword.MadnessAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.HashMap; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathMarauders.java b/Mage.Sets/src/mage/cards/f/FalkenrathMarauders.java index fdc85accd1e..30c9a96f6c0 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathMarauders.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathMarauders.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -36,8 +34,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathNoble.java b/Mage.Sets/src/mage/cards/f/FalkenrathNoble.java index 7cd9b755b0f..0641df43edc 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathNoble.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathNoble.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; @@ -44,6 +43,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathReaver.java b/Mage.Sets/src/mage/cards/f/FalkenrathReaver.java index a9821d247ed..705da8feca1 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathReaver.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathReaver.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java b/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java index c8df4157620..a28f7f9fa77 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java @@ -27,11 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,11 +37,17 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FallOfTheGavel.java b/Mage.Sets/src/mage/cards/f/FallOfTheGavel.java index 11b1c12b325..df7483242c9 100644 --- a/Mage.Sets/src/mage/cards/f/FallOfTheGavel.java +++ b/Mage.Sets/src/mage/cards/f/FallOfTheGavel.java @@ -27,14 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FallOfTheHammer.java b/Mage.Sets/src/mage/cards/f/FallOfTheHammer.java index bd2f90e43f7..4240732ae73 100644 --- a/Mage.Sets/src/mage/cards/f/FallOfTheHammer.java +++ b/Mage.Sets/src/mage/cards/f/FallOfTheHammer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * diff --git a/Mage.Sets/src/mage/cards/f/FallOfTheTitans.java b/Mage.Sets/src/mage/cards/f/FallOfTheTitans.java index 8c0f86eb84e..3070c654329 100644 --- a/Mage.Sets/src/mage/cards/f/FallOfTheTitans.java +++ b/Mage.Sets/src/mage/cards/f/FallOfTheTitans.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.SurgeAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FallenAngel.java b/Mage.Sets/src/mage/cards/f/FallenAngel.java index 5d2694bc269..c7c00f397d6 100644 --- a/Mage.Sets/src/mage/cards/f/FallenAngel.java +++ b/Mage.Sets/src/mage/cards/f/FallenAngel.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,10 +34,13 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FallenAskari.java b/Mage.Sets/src/mage/cards/f/FallenAskari.java index 31b6c7c39d7..3e7a72afa13 100644 --- a/Mage.Sets/src/mage/cards/f/FallenAskari.java +++ b/Mage.Sets/src/mage/cards/f/FallenAskari.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FlankingAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FallenCleric.java b/Mage.Sets/src/mage/cards/f/FallenCleric.java index 963405cd71d..63ac31911cf 100644 --- a/Mage.Sets/src/mage/cards/f/FallenCleric.java +++ b/Mage.Sets/src/mage/cards/f/FallenCleric.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MorphAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java index 0bd01c54ea8..baa025c48a6 100644 --- a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java +++ b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,8 +35,12 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FallenIdeal.java b/Mage.Sets/src/mage/cards/f/FallenIdeal.java index 4c5a8a2ac85..527668adb22 100644 --- a/Mage.Sets/src/mage/cards/f/FallenIdeal.java +++ b/Mage.Sets/src/mage/cards/f/FallenIdeal.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,16 +41,14 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FallingTimber.java b/Mage.Sets/src/mage/cards/f/FallingTimber.java index 50d05432568..4c1e26e6a5c 100644 --- a/Mage.Sets/src/mage/cards/f/FallingTimber.java +++ b/Mage.Sets/src/mage/cards/f/FallingTimber.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FallowEarth.java b/Mage.Sets/src/mage/cards/f/FallowEarth.java index fbaa381e6d8..645fa737cad 100644 --- a/Mage.Sets/src/mage/cards/f/FallowEarth.java +++ b/Mage.Sets/src/mage/cards/f/FallowEarth.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FallowWurm.java b/Mage.Sets/src/mage/cards/f/FallowWurm.java index ab41258f767..d4ef0dba8d5 100644 --- a/Mage.Sets/src/mage/cards/f/FallowWurm.java +++ b/Mage.Sets/src/mage/cards/f/FallowWurm.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandCard; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Fallowsage.java b/Mage.Sets/src/mage/cards/f/Fallowsage.java index 6796b392073..f1fab43aa1a 100644 --- a/Mage.Sets/src/mage/cards/f/Fallowsage.java +++ b/Mage.Sets/src/mage/cards/f/Fallowsage.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BecomesTappedSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FalseCure.java b/Mage.Sets/src/mage/cards/f/FalseCure.java index 90bac32aab2..959c0acdb43 100644 --- a/Mage.Sets/src/mage/cards/f/FalseCure.java +++ b/Mage.Sets/src/mage/cards/f/FalseCure.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FalseDefeat.java b/Mage.Sets/src/mage/cards/f/FalseDefeat.java index ab2810f667b..498111054dd 100644 --- a/Mage.Sets/src/mage/cards/f/FalseDefeat.java +++ b/Mage.Sets/src/mage/cards/f/FalseDefeat.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/f/FalseDemise.java b/Mage.Sets/src/mage/cards/f/FalseDemise.java index be315893f24..410c9499542 100644 --- a/Mage.Sets/src/mage/cards/f/FalseDemise.java +++ b/Mage.Sets/src/mage/cards/f/FalseDemise.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -40,6 +39,8 @@ import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FalseMourning.java b/Mage.Sets/src/mage/cards/f/FalseMourning.java index 5b3ab15f946..03a31bb960c 100644 --- a/Mage.Sets/src/mage/cards/f/FalseMourning.java +++ b/Mage.Sets/src/mage/cards/f/FalseMourning.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FalsePeace.java b/Mage.Sets/src/mage/cards/f/FalsePeace.java index fd64288912f..aaba1fcb4c8 100644 --- a/Mage.Sets/src/mage/cards/f/FalsePeace.java +++ b/Mage.Sets/src/mage/cards/f/FalsePeace.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.SkipNextCombatEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/f/FalseProphet.java b/Mage.Sets/src/mage/cards/f/FalseProphet.java index 5a2de6bea87..5aa28f18951 100644 --- a/Mage.Sets/src/mage/cards/f/FalseProphet.java +++ b/Mage.Sets/src/mage/cards/f/FalseProphet.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ExileAllEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FalseSummoning.java b/Mage.Sets/src/mage/cards/f/FalseSummoning.java index de8e2ec9d6c..4fb6b3dd64d 100644 --- a/Mage.Sets/src/mage/cards/f/FalseSummoning.java +++ b/Mage.Sets/src/mage/cards/f/FalseSummoning.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; -import mage.filter.common.FilterCreatureSpell; -import mage.target.TargetSpell; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.filter.common.FilterCreatureSpell; +import mage.target.TargetSpell; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/Falter.java b/Mage.Sets/src/mage/cards/f/Falter.java index 28b78eb3b00..2d393f47f39 100644 --- a/Mage.Sets/src/mage/cards/f/Falter.java +++ b/Mage.Sets/src/mage/cards/f/Falter.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.combat.CantBlockAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FamiliarGround.java b/Mage.Sets/src/mage/cards/f/FamiliarGround.java index 067575975e5..15562aa2c10 100644 --- a/Mage.Sets/src/mage/cards/f/FamiliarGround.java +++ b/Mage.Sets/src/mage/cards/f/FamiliarGround.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedByMoreThanOneAllEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FamiliarsRuse.java b/Mage.Sets/src/mage/cards/f/FamiliarsRuse.java index 1251e162f91..69798a07e6d 100644 --- a/Mage.Sets/src/mage/cards/f/FamiliarsRuse.java +++ b/Mage.Sets/src/mage/cards/f/FamiliarsRuse.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Famine.java b/Mage.Sets/src/mage/cards/f/Famine.java index fb18ad6a284..0797d3fd32f 100644 --- a/Mage.Sets/src/mage/cards/f/Famine.java +++ b/Mage.Sets/src/mage/cards/f/Famine.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FamishedGhoul.java b/Mage.Sets/src/mage/cards/f/FamishedGhoul.java index 5ac873b85e8..e50230d2386 100644 --- a/Mage.Sets/src/mage/cards/f/FamishedGhoul.java +++ b/Mage.Sets/src/mage/cards/f/FamishedGhoul.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInASingleGraveyard; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/f/FanaticOfMogis.java b/Mage.Sets/src/mage/cards/f/FanaticOfMogis.java index 2e12ffb7beb..16155a1809c 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticOfMogis.java +++ b/Mage.Sets/src/mage/cards/f/FanaticOfMogis.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.DevotionCount; @@ -40,6 +39,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Outcome; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FanaticOfXenagos.java b/Mage.Sets/src/mage/cards/f/FanaticOfXenagos.java index 7883b85642e..466aafb6d85 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticOfXenagos.java +++ b/Mage.Sets/src/mage/cards/f/FanaticOfXenagos.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java b/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java index 3874fcdb5a3..41e23645457 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java +++ b/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FanaticalFever.java b/Mage.Sets/src/mage/cards/f/FanaticalFever.java index b2bb54a67de..2d7af99a89f 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticalFever.java +++ b/Mage.Sets/src/mage/cards/f/FanaticalFever.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author hanasu diff --git a/Mage.Sets/src/mage/cards/f/FangOfThePack.java b/Mage.Sets/src/mage/cards/f/FangOfThePack.java index 83ac7a025d5..17eefa860fa 100644 --- a/Mage.Sets/src/mage/cards/f/FangOfThePack.java +++ b/Mage.Sets/src/mage/cards/f/FangOfThePack.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FangSkulkin.java b/Mage.Sets/src/mage/cards/f/FangSkulkin.java index 85ee7953854..13a37fa8adc 100644 --- a/Mage.Sets/src/mage/cards/f/FangSkulkin.java +++ b/Mage.Sets/src/mage/cards/f/FangSkulkin.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,12 +36,15 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/f/FangrenFirstborn.java b/Mage.Sets/src/mage/cards/f/FangrenFirstborn.java index ae12d4c0eda..d7b5f3cc4e5 100644 --- a/Mage.Sets/src/mage/cards/f/FangrenFirstborn.java +++ b/Mage.Sets/src/mage/cards/f/FangrenFirstborn.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FangrenHunter.java b/Mage.Sets/src/mage/cards/f/FangrenHunter.java index d10cedf3234..6149ec2356e 100644 --- a/Mage.Sets/src/mage/cards/f/FangrenHunter.java +++ b/Mage.Sets/src/mage/cards/f/FangrenHunter.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FangrenMarauder.java b/Mage.Sets/src/mage/cards/f/FangrenMarauder.java index c7ab546a6e6..fa809f6d2ae 100644 --- a/Mage.Sets/src/mage/cards/f/FangrenMarauder.java +++ b/Mage.Sets/src/mage/cards/f/FangrenMarauder.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ZoneChangeAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FangrenPathcutter.java b/Mage.Sets/src/mage/cards/f/FangrenPathcutter.java index ec03e642f6c..17abfc8828d 100644 --- a/Mage.Sets/src/mage/cards/f/FangrenPathcutter.java +++ b/Mage.Sets/src/mage/cards/f/FangrenPathcutter.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FanningTheFlames.java b/Mage.Sets/src/mage/cards/f/FanningTheFlames.java index 9061a611f8e..a4f81677d8a 100644 --- a/Mage.Sets/src/mage/cards/f/FanningTheFlames.java +++ b/Mage.Sets/src/mage/cards/f/FanningTheFlames.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.BuybackAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FarAway.java b/Mage.Sets/src/mage/cards/f/FarAway.java index ebefc5d2d8a..bbfea62e1df 100644 --- a/Mage.Sets/src/mage/cards/f/FarAway.java +++ b/Mage.Sets/src/mage/cards/f/FarAway.java @@ -28,16 +28,17 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardSetInfo; import mage.cards.SplitCard; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FarWanderings.java b/Mage.Sets/src/mage/cards/f/FarWanderings.java index 8689db28f1e..37621525a6e 100644 --- a/Mage.Sets/src/mage/cards/f/FarWanderings.java +++ b/Mage.Sets/src/mage/cards/f/FarWanderings.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FarbogBoneflinger.java b/Mage.Sets/src/mage/cards/f/FarbogBoneflinger.java index 3b71e929b34..e958c7ff881 100644 --- a/Mage.Sets/src/mage/cards/f/FarbogBoneflinger.java +++ b/Mage.Sets/src/mage/cards/f/FarbogBoneflinger.java @@ -27,18 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FarbogExplorer.java b/Mage.Sets/src/mage/cards/f/FarbogExplorer.java index 5bebe241e39..0478d79eb05 100644 --- a/Mage.Sets/src/mage/cards/f/FarbogExplorer.java +++ b/Mage.Sets/src/mage/cards/f/FarbogExplorer.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FarbogRevenant.java b/Mage.Sets/src/mage/cards/f/FarbogRevenant.java index f33ad1ca332..ef760d22cc1 100644 --- a/Mage.Sets/src/mage/cards/f/FarbogRevenant.java +++ b/Mage.Sets/src/mage/cards/f/FarbogRevenant.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.SkulkAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FarhavenElf.java b/Mage.Sets/src/mage/cards/f/FarhavenElf.java index 2254c0b8e08..e69d81ea341 100644 --- a/Mage.Sets/src/mage/cards/f/FarhavenElf.java +++ b/Mage.Sets/src/mage/cards/f/FarhavenElf.java @@ -27,16 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/Farmstead.java b/Mage.Sets/src/mage/cards/f/Farmstead.java index b4df71e1d28..095013e1493 100644 --- a/Mage.Sets/src/mage/cards/f/Farmstead.java +++ b/Mage.Sets/src/mage/cards/f/Farmstead.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,14 +39,12 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FarrelitePriest.java b/Mage.Sets/src/mage/cards/f/FarrelitePriest.java index 1c66774555e..bbd1248d319 100644 --- a/Mage.Sets/src/mage/cards/f/FarrelitePriest.java +++ b/Mage.Sets/src/mage/cards/f/FarrelitePriest.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -45,6 +44,8 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/f/FarrelsMantle.java b/Mage.Sets/src/mage/cards/f/FarrelsMantle.java index 62a0d8b2264..7343527b637 100644 --- a/Mage.Sets/src/mage/cards/f/FarrelsMantle.java +++ b/Mage.Sets/src/mage/cards/f/FarrelsMantle.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,19 +38,17 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; import mage.game.Game; +import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; -import mage.game.permanent.Permanent; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FarrelsZealot.java b/Mage.Sets/src/mage/cards/f/FarrelsZealot.java index c9ff54606b9..b2dcae660a9 100644 --- a/Mage.Sets/src/mage/cards/f/FarrelsZealot.java +++ b/Mage.Sets/src/mage/cards/f/FarrelsZealot.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Farseek.java b/Mage.Sets/src/mage/cards/f/Farseek.java index dc19a3e2f5b..660389d2cd2 100644 --- a/Mage.Sets/src/mage/cards/f/Farseek.java +++ b/Mage.Sets/src/mage/cards/f/Farseek.java @@ -27,18 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FarsightMask.java b/Mage.Sets/src/mage/cards/f/FarsightMask.java index b395b3a8b47..5a03e19dfb3 100644 --- a/Mage.Sets/src/mage/cards/f/FarsightMask.java +++ b/Mage.Sets/src/mage/cards/f/FarsightMask.java @@ -27,18 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author North */ diff --git a/Mage.Sets/src/mage/cards/f/Fascination.java b/Mage.Sets/src/mage/cards/f/Fascination.java index 918d07660a1..8579faee023 100644 --- a/Mage.Sets/src/mage/cards/f/Fascination.java +++ b/Mage.Sets/src/mage/cards/f/Fascination.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DrawCardAllEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/Fastbond.java b/Mage.Sets/src/mage/cards/f/Fastbond.java index 6f5eb254a0c..4792077740e 100644 --- a/Mage.Sets/src/mage/cards/f/Fastbond.java +++ b/Mage.Sets/src/mage/cards/f/Fastbond.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DamageControllerEffect; @@ -42,6 +41,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FatalBlow.java b/Mage.Sets/src/mage/cards/f/FatalBlow.java index 7e51b2bc52d..3aada1c320c 100644 --- a/Mage.Sets/src/mage/cards/f/FatalBlow.java +++ b/Mage.Sets/src/mage/cards/f/FatalBlow.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FatalFrenzy.java b/Mage.Sets/src/mage/cards/f/FatalFrenzy.java index 08ab764a29b..a67d39c7adc 100644 --- a/Mage.Sets/src/mage/cards/f/FatalFrenzy.java +++ b/Mage.Sets/src/mage/cards/f/FatalFrenzy.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FatalFumes.java b/Mage.Sets/src/mage/cards/f/FatalFumes.java index ccbd28e5dc3..dac8e3ae8a4 100644 --- a/Mage.Sets/src/mage/cards/f/FatalFumes.java +++ b/Mage.Sets/src/mage/cards/f/FatalFumes.java @@ -28,14 +28,15 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FatalMutation.java b/Mage.Sets/src/mage/cards/f/FatalMutation.java index b49813e1bdd..c1a83891ae5 100644 --- a/Mage.Sets/src/mage/cards/f/FatalMutation.java +++ b/Mage.Sets/src/mage/cards/f/FatalMutation.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FatalPush.java b/Mage.Sets/src/mage/cards/f/FatalPush.java index 7d6678a0621..2c9a40ee2ee 100644 --- a/Mage.Sets/src/mage/cards/f/FatalPush.java +++ b/Mage.Sets/src/mage/cards/f/FatalPush.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.effects.OneShotEffect; @@ -41,6 +40,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.watchers.common.RevoltWatcher; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FateForetold.java b/Mage.Sets/src/mage/cards/f/FateForetold.java index fc39dc975bf..7f3283eeb01 100644 --- a/Mage.Sets/src/mage/cards/f/FateForetold.java +++ b/Mage.Sets/src/mage/cards/f/FateForetold.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FateForgotten.java b/Mage.Sets/src/mage/cards/f/FateForgotten.java index 88fec4d8c57..1b206f54c0e 100644 --- a/Mage.Sets/src/mage/cards/f/FateForgotten.java +++ b/Mage.Sets/src/mage/cards/f/FateForgotten.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FateTransfer.java b/Mage.Sets/src/mage/cards/f/FateTransfer.java index 523ac5aa641..49b1d384d08 100644 --- a/Mage.Sets/src/mage/cards/f/FateTransfer.java +++ b/Mage.Sets/src/mage/cards/f/FateTransfer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FateUnraveler.java b/Mage.Sets/src/mage/cards/f/FateUnraveler.java index 80f0d2c0f5d..81b9848dd97 100644 --- a/Mage.Sets/src/mage/cards/f/FateUnraveler.java +++ b/Mage.Sets/src/mage/cards/f/FateUnraveler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DrawCardOpponentTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FatedConflagration.java b/Mage.Sets/src/mage/cards/f/FatedConflagration.java index 5c16d58bd1b..d9f53e7dbb5 100644 --- a/Mage.Sets/src/mage/cards/f/FatedConflagration.java +++ b/Mage.Sets/src/mage/cards/f/FatedConflagration.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlaneswalker; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FatedInfatuation.java b/Mage.Sets/src/mage/cards/f/FatedInfatuation.java index db36763b331..11c8c70a43d 100644 --- a/Mage.Sets/src/mage/cards/f/FatedInfatuation.java +++ b/Mage.Sets/src/mage/cards/f/FatedInfatuation.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FatedIntervention.java b/Mage.Sets/src/mage/cards/f/FatedIntervention.java index 3acd2b4cfe5..3fde9f32cb9 100644 --- a/Mage.Sets/src/mage/cards/f/FatedIntervention.java +++ b/Mage.Sets/src/mage/cards/f/FatedIntervention.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.CentaurEnchantmentCreatureToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FatedRetribution.java b/Mage.Sets/src/mage/cards/f/FatedRetribution.java index ab01ef0a903..3936ce7fef8 100644 --- a/Mage.Sets/src/mage/cards/f/FatedRetribution.java +++ b/Mage.Sets/src/mage/cards/f/FatedRetribution.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DestroyAllEffect; @@ -39,6 +38,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FatedReturn.java b/Mage.Sets/src/mage/cards/f/FatedReturn.java index 269b35e0d52..dc15b2739a3 100644 --- a/Mage.Sets/src/mage/cards/f/FatedReturn.java +++ b/Mage.Sets/src/mage/cards/f/FatedReturn.java @@ -27,12 +27,11 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FatefulShowdown.java b/Mage.Sets/src/mage/cards/f/FatefulShowdown.java index dd5f8cab3b9..873e14390a0 100644 --- a/Mage.Sets/src/mage/cards/f/FatefulShowdown.java +++ b/Mage.Sets/src/mage/cards/f/FatefulShowdown.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Fatespinner.java b/Mage.Sets/src/mage/cards/f/Fatespinner.java index 6078d1eb96e..a078d679b13 100644 --- a/Mage.Sets/src/mage/cards/f/Fatespinner.java +++ b/Mage.Sets/src/mage/cards/f/Fatespinner.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.HashSet; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,16 +36,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.HashSet; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Fatestitcher.java b/Mage.Sets/src/mage/cards/f/Fatestitcher.java index 99296edaf4a..175eee4d589 100644 --- a/Mage.Sets/src/mage/cards/f/Fatestitcher.java +++ b/Mage.Sets/src/mage/cards/f/Fatestitcher.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,11 +36,14 @@ import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FathomFeeder.java b/Mage.Sets/src/mage/cards/f/FathomFeeder.java index 9feb4b51c00..a58b4bac3ad 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFeeder.java +++ b/Mage.Sets/src/mage/cards/f/FathomFeeder.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FathomMage.java b/Mage.Sets/src/mage/cards/f/FathomMage.java index e898a535230..70891917e8a 100644 --- a/Mage.Sets/src/mage/cards/f/FathomMage.java +++ b/Mage.Sets/src/mage/cards/f/FathomMage.java @@ -28,7 +28,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FathomSeer.java b/Mage.Sets/src/mage/cards/f/FathomSeer.java index 5d3c07c1344..e2eb4e81e5a 100644 --- a/Mage.Sets/src/mage/cards/f/FathomSeer.java +++ b/Mage.Sets/src/mage/cards/f/FathomSeer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FathomTrawl.java b/Mage.Sets/src/mage/cards/f/FathomTrawl.java index e28f39edcf7..0e67b1ad933 100644 --- a/Mage.Sets/src/mage/cards/f/FathomTrawl.java +++ b/Mage.Sets/src/mage/cards/f/FathomTrawl.java @@ -27,21 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Derpthemeus diff --git a/Mage.Sets/src/mage/cards/f/FaultLine.java b/Mage.Sets/src/mage/cards/f/FaultLine.java index 1d2099ba988..c299a746a6f 100644 --- a/Mage.Sets/src/mage/cards/f/FaultLine.java +++ b/Mage.Sets/src/mage/cards/f/FaultLine.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FaultRiders.java b/Mage.Sets/src/mage/cards/f/FaultRiders.java index 982df06cfff..a493d0f001b 100644 --- a/Mage.Sets/src/mage/cards/f/FaultRiders.java +++ b/Mage.Sets/src/mage/cards/f/FaultRiders.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/Faultgrinder.java b/Mage.Sets/src/mage/cards/f/Faultgrinder.java index 237aa0e2e52..2af64c9014a 100644 --- a/Mage.Sets/src/mage/cards/f/Faultgrinder.java +++ b/Mage.Sets/src/mage/cards/f/Faultgrinder.java @@ -27,19 +27,20 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.EvokeAbility; +import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.Target; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FaunaShaman.java b/Mage.Sets/src/mage/cards/f/FaunaShaman.java index 60d6b8a69a6..a1d7e5b0c68 100644 --- a/Mage.Sets/src/mage/cards/f/FaunaShaman.java +++ b/Mage.Sets/src/mage/cards/f/FaunaShaman.java @@ -28,10 +28,6 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,10 +37,15 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java index 151fad22acf..b3e46b83b97 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,12 +34,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter.ComparisonType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; @@ -51,6 +45,8 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java b/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java index f1be9fd367b..173a31f6b81 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,15 +38,17 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; -import mage.constants.CardType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AttachmentType; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheWoods.java b/Mage.Sets/src/mage/cards/f/FavorOfTheWoods.java index 3ea2048202b..8b46dd0a644 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheWoods.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.BlocksAttachedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,10 +34,13 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author intimidatingant diff --git a/Mage.Sets/src/mage/cards/f/FavorableWinds.java b/Mage.Sets/src/mage/cards/f/FavorableWinds.java index 9ecae5998d6..25e5d974d4b 100644 --- a/Mage.Sets/src/mage/cards/f/FavorableWinds.java +++ b/Mage.Sets/src/mage/cards/f/FavorableWinds.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/f/FavoredHoplite.java b/Mage.Sets/src/mage/cards/f/FavoredHoplite.java index 97f772fc196..cb68892b212 100644 --- a/Mage.Sets/src/mage/cards/f/FavoredHoplite.java +++ b/Mage.Sets/src/mage/cards/f/FavoredHoplite.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.PreventAllDamageToSourceEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Fear.java b/Mage.Sets/src/mage/cards/f/Fear.java index cb6fcfab800..7eebf6aa841 100644 --- a/Mage.Sets/src/mage/cards/f/Fear.java +++ b/Mage.Sets/src/mage/cards/f/Fear.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -38,9 +35,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FearsomeAwakening.java b/Mage.Sets/src/mage/cards/f/FearsomeAwakening.java index 656b8a555da..c5e31654fdb 100644 --- a/Mage.Sets/src/mage/cards/f/FearsomeAwakening.java +++ b/Mage.Sets/src/mage/cards/f/FearsomeAwakening.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java index 4d705fb1cee..79182e2ff6b 100644 --- a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java +++ b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,14 +39,12 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FeastOfBlood.java b/Mage.Sets/src/mage/cards/f/FeastOfBlood.java index d035327656b..64ef68626c8 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfBlood.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfBlood.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -36,11 +34,14 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FeastOfDreams.java b/Mage.Sets/src/mage/cards/f/FeastOfDreams.java index fa093df99ac..d1ecdc431f1 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfDreams.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfDreams.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java index 908b771dcfd..28660f16178 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FeastOfWorms.java b/Mage.Sets/src/mage/cards/f/FeastOfWorms.java index 21b13ad845b..113dd8ba42c 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfWorms.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfWorms.java @@ -28,14 +28,13 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX @@ -96,7 +97,7 @@ class FeastOfWormsEffect extends OneShotEffect { if (permanent != null) { targetPlayer = game.getPlayer(permanent.getControllerId()); } - if (targetPlayer != null && permanent != null && (permanent.getSupertype().get(0).equals("Legendary"))) { + if (targetPlayer != null && permanent != null && (permanent.isLegendary())) { FilterControlledPermanent filter = new FilterControlledLandPermanent("land to sacrifice"); filter.add(new ControllerIdPredicate(targetPlayer.getId())); TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, false); diff --git a/Mage.Sets/src/mage/cards/f/FeastOnTheFallen.java b/Mage.Sets/src/mage/cards/f/FeastOnTheFallen.java index d43c0cc093b..045209bd6bd 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOnTheFallen.java +++ b/Mage.Sets/src/mage/cards/f/FeastOnTheFallen.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.Condition; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; import mage.watchers.common.PlayerLostLifeWatcher; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FeastOrFamine.java b/Mage.Sets/src/mage/cards/f/FeastOrFamine.java index 5996d2b59f7..24e77ee0fc7 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOrFamine.java +++ b/Mage.Sets/src/mage/cards/f/FeastOrFamine.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Mode; import mage.abilities.effects.common.CreateTokenEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FeatOfResistance.java b/Mage.Sets/src/mage/cards/f/FeatOfResistance.java index 2fd619d5d35..22da8267cb7 100644 --- a/Mage.Sets/src/mage/cards/f/FeatOfResistance.java +++ b/Mage.Sets/src/mage/cards/f/FeatOfResistance.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.GainProtectionFromColorTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/Fecundity.java b/Mage.Sets/src/mage/cards/f/Fecundity.java index daa5ae176b8..c9935812cd8 100644 --- a/Mage.Sets/src/mage/cards/f/Fecundity.java +++ b/Mage.Sets/src/mage/cards/f/Fecundity.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Feebleness.java b/Mage.Sets/src/mage/cards/f/Feebleness.java index 2818f54028f..9ca3a05f2ab 100644 --- a/Mage.Sets/src/mage/cards/f/Feebleness.java +++ b/Mage.Sets/src/mage/cards/f/Feebleness.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -44,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/f/FeedTheClan.java b/Mage.Sets/src/mage/cards/f/FeedTheClan.java index e8c1f7368a2..6a99d626eaf 100644 --- a/Mage.Sets/src/mage/cards/f/FeedTheClan.java +++ b/Mage.Sets/src/mage/cards/f/FeedTheClan.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FeedThePack.java b/Mage.Sets/src/mage/cards/f/FeedThePack.java index 2706fed5d43..2a0395d4abd 100644 --- a/Mage.Sets/src/mage/cards/f/FeedThePack.java +++ b/Mage.Sets/src/mage/cards/f/FeedThePack.java @@ -27,15 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; @@ -46,6 +44,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/f/Feedback.java b/Mage.Sets/src/mage/cards/f/Feedback.java index 27f7892f25d..9b0cc938009 100644 --- a/Mage.Sets/src/mage/cards/f/Feedback.java +++ b/Mage.Sets/src/mage/cards/f/Feedback.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FeedbackBolt.java b/Mage.Sets/src/mage/cards/f/FeedbackBolt.java index 76d917a3ade..c44e8812aea 100644 --- a/Mage.Sets/src/mage/cards/f/FeedbackBolt.java +++ b/Mage.Sets/src/mage/cards/f/FeedbackBolt.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FeedingFrenzy.java b/Mage.Sets/src/mage/cards/f/FeedingFrenzy.java index c23ed072755..00834c43c94 100644 --- a/Mage.Sets/src/mage/cards/f/FeedingFrenzy.java +++ b/Mage.Sets/src/mage/cards/f/FeedingFrenzy.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author openSrcCoder diff --git a/Mage.Sets/src/mage/cards/f/FeelingOfDread.java b/Mage.Sets/src/mage/cards/f/FeelingOfDread.java index c94247b1bdb..ae0befc4c8a 100644 --- a/Mage.Sets/src/mage/cards/f/FeelingOfDread.java +++ b/Mage.Sets/src/mage/cards/f/FeelingOfDread.java @@ -27,17 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java index f3a6896a3b4..e71ca124be3 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java +++ b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -43,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -50,6 +50,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +60,7 @@ public class FeldonOfTheThirdPath extends CardImpl { public FeldonOfTheThirdPath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); diff --git a/Mage.Sets/src/mage/cards/f/FeldonsCane.java b/Mage.Sets/src/mage/cards/f/FeldonsCane.java index 3d04bd9ef37..5bb979b5bf7 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonsCane.java +++ b/Mage.Sets/src/mage/cards/f/FeldonsCane.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileSourceCost; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java index e37d2111146..a8b97ba311a 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FelhideMinotaur.java b/Mage.Sets/src/mage/cards/f/FelhideMinotaur.java index 6b67c5177b3..c455558988e 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideMinotaur.java +++ b/Mage.Sets/src/mage/cards/f/FelhideMinotaur.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java b/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java index 31ce541e296..a9452c97c1f 100644 --- a/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java +++ b/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java index 8da4e58b751..d7a81fd1806 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java +++ b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FelidarCub.java b/Mage.Sets/src/mage/cards/f/FelidarCub.java index 978842c67cd..58f06019329 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarCub.java +++ b/Mage.Sets/src/mage/cards/f/FelidarCub.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FelidarGuardian.java b/Mage.Sets/src/mage/cards/f/FelidarGuardian.java index 2cb2214b319..8349d96ac54 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarGuardian.java +++ b/Mage.Sets/src/mage/cards/f/FelidarGuardian.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FelidarSovereign.java b/Mage.Sets/src/mage/cards/f/FelidarSovereign.java index 1ff72345937..58e94ef6b21 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarSovereign.java +++ b/Mage.Sets/src/mage/cards/f/FelidarSovereign.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -41,8 +38,12 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TargetController; import mage.game.Game; +import java.util.UUID; + /** * * @author Rafbill diff --git a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java index 2e216046dad..e56f2e5aaea 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java +++ b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java @@ -27,11 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,10 +38,16 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.TotemArmorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FellTheMighty.java b/Mage.Sets/src/mage/cards/f/FellTheMighty.java index 9676dfa4cb6..c03c261f52e 100644 --- a/Mage.Sets/src/mage/cards/f/FellTheMighty.java +++ b/Mage.Sets/src/mage/cards/f/FellTheMighty.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FellwarStone.java b/Mage.Sets/src/mage/cards/f/FellwarStone.java index 57861384d23..ef86ae97475 100644 --- a/Mage.Sets/src/mage/cards/f/FellwarStone.java +++ b/Mage.Sets/src/mage/cards/f/FellwarStone.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.mana.AnyColorLandsProduceManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FemerefArchers.java b/Mage.Sets/src/mage/cards/f/FemerefArchers.java index c7e19a1ec61..d5ed739f100 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefArchers.java +++ b/Mage.Sets/src/mage/cards/f/FemerefArchers.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +35,14 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FemerefEnchantress.java b/Mage.Sets/src/mage/cards/f/FemerefEnchantress.java index 8ce9e8ae839..cbd55950fe7 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefEnchantress.java +++ b/Mage.Sets/src/mage/cards/f/FemerefEnchantress.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ZoneChangeAllTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FemerefHealer.java b/Mage.Sets/src/mage/cards/f/FemerefHealer.java index 5347c92f030..10e7ecc4f62 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefHealer.java +++ b/Mage.Sets/src/mage/cards/f/FemerefHealer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FemerefKnight.java b/Mage.Sets/src/mage/cards/f/FemerefKnight.java index 3cdf00368b4..ad4ef216634 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefKnight.java +++ b/Mage.Sets/src/mage/cards/f/FemerefKnight.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,9 +35,12 @@ import mage.abilities.keyword.FlankingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FemerefScouts.java b/Mage.Sets/src/mage/cards/f/FemerefScouts.java index fdeaf38407c..55afedba86f 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefScouts.java +++ b/Mage.Sets/src/mage/cards/f/FemerefScouts.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FenHauler.java b/Mage.Sets/src/mage/cards/f/FenHauler.java index 302982662c4..9716e7a9633 100644 --- a/Mage.Sets/src/mage/cards/f/FenHauler.java +++ b/Mage.Sets/src/mage/cards/f/FenHauler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FenStalker.java b/Mage.Sets/src/mage/cards/f/FenStalker.java index 9279bf4aca7..2313147242b 100644 --- a/Mage.Sets/src/mage/cards/f/FenStalker.java +++ b/Mage.Sets/src/mage/cards/f/FenStalker.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FencerClique.java b/Mage.Sets/src/mage/cards/f/FencerClique.java index 0bad67a90da..579c4e20f35 100644 --- a/Mage.Sets/src/mage/cards/f/FencerClique.java +++ b/Mage.Sets/src/mage/cards/f/FencerClique.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FencersMagemark.java b/Mage.Sets/src/mage/cards/f/FencersMagemark.java index 76d442d3b5b..b8e6beb3767 100644 --- a/Mage.Sets/src/mage/cards/f/FencersMagemark.java +++ b/Mage.Sets/src/mage/cards/f/FencersMagemark.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -38,17 +37,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Markedagain diff --git a/Mage.Sets/src/mage/cards/f/FencingAce.java b/Mage.Sets/src/mage/cards/f/FencingAce.java index c08009c6916..f36777ecbe5 100644 --- a/Mage.Sets/src/mage/cards/f/FencingAce.java +++ b/Mage.Sets/src/mage/cards/f/FencingAce.java @@ -27,11 +27,11 @@ */ package mage.cards.f; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FendeepSummoner.java b/Mage.Sets/src/mage/cards/f/FendeepSummoner.java index eee40fc5357..c77aaa7e372 100644 --- a/Mage.Sets/src/mage/cards/f/FendeepSummoner.java +++ b/Mage.Sets/src/mage/cards/f/FendeepSummoner.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +34,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; @@ -44,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * @author anonymous */ diff --git a/Mage.Sets/src/mage/cards/f/FeralAnimist.java b/Mage.Sets/src/mage/cards/f/FeralAnimist.java index bd356f1013e..33de11ea808 100644 --- a/Mage.Sets/src/mage/cards/f/FeralAnimist.java +++ b/Mage.Sets/src/mage/cards/f/FeralAnimist.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +35,11 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FeralContest.java b/Mage.Sets/src/mage/cards/f/FeralContest.java index fe7bf27895b..1e906016384 100644 --- a/Mage.Sets/src/mage/cards/f/FeralContest.java +++ b/Mage.Sets/src/mage/cards/f/FeralContest.java @@ -27,14 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -44,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FeralDeceiver.java b/Mage.Sets/src/mage/cards/f/FeralDeceiver.java index b62fe0fa351..86fc18f5cee 100644 --- a/Mage.Sets/src/mage/cards/f/FeralDeceiver.java +++ b/Mage.Sets/src/mage/cards/f/FeralDeceiver.java @@ -27,14 +27,9 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.abilities.common.FeralDeceiverAbility; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; +import mage.abilities.common.FeralDeceiverAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +39,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FeralHydra.java b/Mage.Sets/src/mage/cards/f/FeralHydra.java index acd1babf5d9..7d3549153ef 100644 --- a/Mage.Sets/src/mage/cards/f/FeralHydra.java +++ b/Mage.Sets/src/mage/cards/f/FeralHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FeralIncarnation.java b/Mage.Sets/src/mage/cards/f/FeralIncarnation.java index a9eccdb7d6d..9417a96eb8a 100644 --- a/Mage.Sets/src/mage/cards/f/FeralIncarnation.java +++ b/Mage.Sets/src/mage/cards/f/FeralIncarnation.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.BeastToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FeralInstinct.java b/Mage.Sets/src/mage/cards/f/FeralInstinct.java index 690361189ff..cbbb8f69345 100644 --- a/Mage.Sets/src/mage/cards/f/FeralInstinct.java +++ b/Mage.Sets/src/mage/cards/f/FeralInstinct.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FeralInvocation.java b/Mage.Sets/src/mage/cards/f/FeralInvocation.java index 90f5ddef6d0..7bd0f861d8c 100644 --- a/Mage.Sets/src/mage/cards/f/FeralInvocation.java +++ b/Mage.Sets/src/mage/cards/f/FeralInvocation.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FeralKrushok.java b/Mage.Sets/src/mage/cards/f/FeralKrushok.java index 778618b1057..ad8b596fa54 100644 --- a/Mage.Sets/src/mage/cards/f/FeralKrushok.java +++ b/Mage.Sets/src/mage/cards/f/FeralKrushok.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FeralLightning.java b/Mage.Sets/src/mage/cards/f/FeralLightning.java index 2d159954f5e..88d312b03bf 100644 --- a/Mage.Sets/src/mage/cards/f/FeralLightning.java +++ b/Mage.Sets/src/mage/cards/f/FeralLightning.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.permanent.token.ElementalToken; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java b/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java index f15c627d8d5..8fc03e4f3ce 100644 --- a/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java +++ b/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/f/FeralShadow.java b/Mage.Sets/src/mage/cards/f/FeralShadow.java index ba08235dfb4..d20cb7b015b 100644 --- a/Mage.Sets/src/mage/cards/f/FeralShadow.java +++ b/Mage.Sets/src/mage/cards/f/FeralShadow.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FeralThallid.java b/Mage.Sets/src/mage/cards/f/FeralThallid.java index a9febd9bd64..9be4009d387 100644 --- a/Mage.Sets/src/mage/cards/f/FeralThallid.java +++ b/Mage.Sets/src/mage/cards/f/FeralThallid.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FeralThrowback.java b/Mage.Sets/src/mage/cards/f/FeralThrowback.java index 510b0f5df57..1ce4881748f 100644 --- a/Mage.Sets/src/mage/cards/f/FeralThrowback.java +++ b/Mage.Sets/src/mage/cards/f/FeralThrowback.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.AmplifyEffect; import mage.abilities.keyword.AmplifyAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FerociousCharge.java b/Mage.Sets/src/mage/cards/f/FerociousCharge.java index cb5be500079..31571b6339d 100644 --- a/Mage.Sets/src/mage/cards/f/FerociousCharge.java +++ b/Mage.Sets/src/mage/cards/f/FerociousCharge.java @@ -27,15 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java b/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java index 4826688db2f..e890d3dc3ed 100644 --- a/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java +++ b/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -45,6 +44,8 @@ import mage.target.TargetSpell; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FerozsBan.java b/Mage.Sets/src/mage/cards/f/FerozsBan.java index 4662626fc42..629a3c7aa26 100644 --- a/Mage.Sets/src/mage/cards/f/FerozsBan.java +++ b/Mage.Sets/src/mage/cards/f/FerozsBan.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.cost.SpellsCostIncreasementAllEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Ferropede.java b/Mage.Sets/src/mage/cards/f/Ferropede.java index d51fdc01be4..eb7117b12c1 100644 --- a/Mage.Sets/src/mage/cards/f/Ferropede.java +++ b/Mage.Sets/src/mage/cards/f/Ferropede.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Ferrovore.java b/Mage.Sets/src/mage/cards/f/Ferrovore.java index a01026afd1c..0ef0a5bf196 100644 --- a/Mage.Sets/src/mage/cards/f/Ferrovore.java +++ b/Mage.Sets/src/mage/cards/f/Ferrovore.java @@ -28,10 +28,6 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +36,15 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FertileGround.java b/Mage.Sets/src/mage/cards/f/FertileGround.java index 6dc49e8bc25..67fa7b2204f 100644 --- a/Mage.Sets/src/mage/cards/f/FertileGround.java +++ b/Mage.Sets/src/mage/cards/f/FertileGround.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.common.AddManaAnyColorAttachedControllerEffect; import mage.abilities.effects.common.AttachEffect; @@ -46,6 +45,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FertileThicket.java b/Mage.Sets/src/mage/cards/f/FertileThicket.java index dbd373c4be4..653c9a3c272 100644 --- a/Mage.Sets/src/mage/cards/f/FertileThicket.java +++ b/Mage.Sets/src/mage/cards/f/FertileThicket.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Fertilid.java b/Mage.Sets/src/mage/cards/f/Fertilid.java index c75de9ace93..f5da87c7084 100644 --- a/Mage.Sets/src/mage/cards/f/Fertilid.java +++ b/Mage.Sets/src/mage/cards/f/Fertilid.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterBasicLandCard; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/f/FerventCathar.java b/Mage.Sets/src/mage/cards/f/FerventCathar.java index da6c015e544..1e92afb33d3 100644 --- a/Mage.Sets/src/mage/cards/f/FerventCathar.java +++ b/Mage.Sets/src/mage/cards/f/FerventCathar.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/f/FerventCharge.java b/Mage.Sets/src/mage/cards/f/FerventCharge.java index 61cd7e415ed..7550e1548a3 100644 --- a/Mage.Sets/src/mage/cards/f/FerventCharge.java +++ b/Mage.Sets/src/mage/cards/f/FerventCharge.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FerventDenial.java b/Mage.Sets/src/mage/cards/f/FerventDenial.java index 8074f0876c5..18ad51c3d39 100644 --- a/Mage.Sets/src/mage/cards/f/FerventDenial.java +++ b/Mage.Sets/src/mage/cards/f/FerventDenial.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/f/Fervor.java b/Mage.Sets/src/mage/cards/f/Fervor.java index bfa4b38af58..e13f38eb07c 100644 --- a/Mage.Sets/src/mage/cards/f/Fervor.java +++ b/Mage.Sets/src/mage/cards/f/Fervor.java @@ -27,17 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/Festercreep.java b/Mage.Sets/src/mage/cards/f/Festercreep.java index b5c541f7949..72aab3475b3 100644 --- a/Mage.Sets/src/mage/cards/f/Festercreep.java +++ b/Mage.Sets/src/mage/cards/f/Festercreep.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FesterhideBoar.java b/Mage.Sets/src/mage/cards/f/FesterhideBoar.java index 9ab90e01075..d294d750852 100644 --- a/Mage.Sets/src/mage/cards/f/FesterhideBoar.java +++ b/Mage.Sets/src/mage/cards/f/FesterhideBoar.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.MorbidCondition; @@ -37,8 +35,11 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FesteringEvil.java b/Mage.Sets/src/mage/cards/f/FesteringEvil.java index 713341a8264..05cd983dff6 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringEvil.java +++ b/Mage.Sets/src/mage/cards/f/FesteringEvil.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FesteringGoblin.java b/Mage.Sets/src/mage/cards/f/FesteringGoblin.java index b6dcbad68f1..a77eb20278c 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringGoblin.java +++ b/Mage.Sets/src/mage/cards/f/FesteringGoblin.java @@ -27,18 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FesteringMarch.java b/Mage.Sets/src/mage/cards/f/FesteringMarch.java index 59aa0f77dbc..e74fa98a870 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringMarch.java +++ b/Mage.Sets/src/mage/cards/f/FesteringMarch.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FesteringNewt.java b/Mage.Sets/src/mage/cards/f/FesteringNewt.java index 1efc5054934..5f9f6f80860 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringNewt.java +++ b/Mage.Sets/src/mage/cards/f/FesteringNewt.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Festival.java b/Mage.Sets/src/mage/cards/f/Festival.java index 51550430174..d86d3161cc1 100644 --- a/Mage.Sets/src/mage/cards/f/Festival.java +++ b/Mage.Sets/src/mage/cards/f/Festival.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; import mage.abilities.condition.common.OnOpponentsTurnCondition; import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect; @@ -38,6 +37,8 @@ import mage.constants.Duration; import mage.constants.PhaseStep; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/f/FestivalOfTheGuildpact.java b/Mage.Sets/src/mage/cards/f/FestivalOfTheGuildpact.java index 04bc51ce390..2b5890b7066 100644 --- a/Mage.Sets/src/mage/cards/f/FestivalOfTheGuildpact.java +++ b/Mage.Sets/src/mage/cards/f/FestivalOfTheGuildpact.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PreventDamageToControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FestivalOfTrokin.java b/Mage.Sets/src/mage/cards/f/FestivalOfTrokin.java index 83bc0a8ea5e..4788b8f5b78 100644 --- a/Mage.Sets/src/mage/cards/f/FestivalOfTrokin.java +++ b/Mage.Sets/src/mage/cards/f/FestivalOfTrokin.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FetidHeath.java b/Mage.Sets/src/mage/cards/f/FetidHeath.java index 3bcb3b27957..1c9028ae98a 100644 --- a/Mage.Sets/src/mage/cards/f/FetidHeath.java +++ b/Mage.Sets/src/mage/cards/f/FetidHeath.java @@ -28,8 +28,6 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +35,11 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FetidHorror.java b/Mage.Sets/src/mage/cards/f/FetidHorror.java index 053a66bba09..3d4fecb2765 100644 --- a/Mage.Sets/src/mage/cards/f/FetidHorror.java +++ b/Mage.Sets/src/mage/cards/f/FetidHorror.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -39,6 +38,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author djbrez diff --git a/Mage.Sets/src/mage/cards/f/FetidImp.java b/Mage.Sets/src/mage/cards/f/FetidImp.java index be9ce03d5d8..1d06138a219 100644 --- a/Mage.Sets/src/mage/cards/f/FetidImp.java +++ b/Mage.Sets/src/mage/cards/f/FetidImp.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Fettergeist.java b/Mage.Sets/src/mage/cards/f/Fettergeist.java index 3a1571264ab..70f2aad0f64 100644 --- a/Mage.Sets/src/mage/cards/f/Fettergeist.java +++ b/Mage.Sets/src/mage/cards/f/Fettergeist.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -37,6 +36,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java b/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java index 71d6a9269ae..14f3b69439b 100644 --- a/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java +++ b/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FeverCharm.java b/Mage.Sets/src/mage/cards/f/FeverCharm.java index 2988d7321b3..ccf23f0ae65 100644 --- a/Mage.Sets/src/mage/cards/f/FeverCharm.java +++ b/Mage.Sets/src/mage/cards/f/FeverCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java b/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java index 18690f8a92b..e3545c2efd4 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java +++ b/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java @@ -27,19 +27,19 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FeveredStrength.java b/Mage.Sets/src/mage/cards/f/FeveredStrength.java index 1fc93fabcfd..74e4aa16d41 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredStrength.java +++ b/Mage.Sets/src/mage/cards/f/FeveredStrength.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FeveredVisions.java b/Mage.Sets/src/mage/cards/f/FeveredVisions.java index 68df6d43e92..a8fa4647389 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredVisions.java +++ b/Mage.Sets/src/mage/cards/f/FeveredVisions.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -40,6 +38,9 @@ import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.Set; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FibrousEntangler.java b/Mage.Sets/src/mage/cards/f/FibrousEntangler.java index efd7bd7d4ad..3b5bd1ae31f 100644 --- a/Mage.Sets/src/mage/cards/f/FibrousEntangler.java +++ b/Mage.Sets/src/mage/cards/f/FibrousEntangler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FiddleheadKami.java b/Mage.Sets/src/mage/cards/f/FiddleheadKami.java index 202d30c299c..510cf6e3571 100644 --- a/Mage.Sets/src/mage/cards/f/FiddleheadKami.java +++ b/Mage.Sets/src/mage/cards/f/FiddleheadKami.java @@ -27,15 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterSpiritOrArcaneCard; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FieldCreeper.java b/Mage.Sets/src/mage/cards/f/FieldCreeper.java index ac4f4922bc0..c5bb7c77676 100644 --- a/Mage.Sets/src/mage/cards/f/FieldCreeper.java +++ b/Mage.Sets/src/mage/cards/f/FieldCreeper.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/f/FieldMarshal.java b/Mage.Sets/src/mage/cards/f/FieldMarshal.java index a204bf37268..a592803062c 100644 --- a/Mage.Sets/src/mage/cards/f/FieldMarshal.java +++ b/Mage.Sets/src/mage/cards/f/FieldMarshal.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -37,11 +34,14 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * @author anonymous */ diff --git a/Mage.Sets/src/mage/cards/f/FieldOfDreams.java b/Mage.Sets/src/mage/cards/f/FieldOfDreams.java index 452632f77cf..969f93b59ea 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfDreams.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfDreams.java @@ -27,14 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.PlayWithTheTopCardRevealedEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox @@ -43,7 +45,7 @@ public class FieldOfDreams extends CardImpl { public FieldOfDreams(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // Players play with the top card of their libraries revealed. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect(true))); diff --git a/Mage.Sets/src/mage/cards/f/FieldOfReality.java b/Mage.Sets/src/mage/cards/f/FieldOfReality.java index cb0ea8f996c..e2a6c49c5cf 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfReality.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfReality.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,15 +36,13 @@ import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesAttachedEffe import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author LevelX */ diff --git a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java index bb47ef9e0d1..0fd0fa306bf 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FieldSurgeon.java b/Mage.Sets/src/mage/cards/f/FieldSurgeon.java index 9ae2f533287..31377557b54 100644 --- a/Mage.Sets/src/mage/cards/f/FieldSurgeon.java +++ b/Mage.Sets/src/mage/cards/f/FieldSurgeon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FieldmistBorderpost.java b/Mage.Sets/src/mage/cards/f/FieldmistBorderpost.java index 3c63c095dd8..e49d804f581 100644 --- a/Mage.Sets/src/mage/cards/f/FieldmistBorderpost.java +++ b/Mage.Sets/src/mage/cards/f/FieldmistBorderpost.java @@ -28,9 +28,7 @@ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; @@ -39,11 +37,15 @@ import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki @@ -53,7 +55,7 @@ public class FieldmistBorderpost extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a basic land"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public FieldmistBorderpost (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FiendBinder.java b/Mage.Sets/src/mage/cards/f/FiendBinder.java index 8a8f74b0425..91cff5f2815 100644 --- a/Mage.Sets/src/mage/cards/f/FiendBinder.java +++ b/Mage.Sets/src/mage/cards/f/FiendBinder.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -40,6 +39,8 @@ import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FiendHunter.java b/Mage.Sets/src/mage/cards/f/FiendHunter.java index 464ab58be7c..1fd2442f24c 100644 --- a/Mage.Sets/src/mage/cards/f/FiendHunter.java +++ b/Mage.Sets/src/mage/cards/f/FiendHunter.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,12 +35,15 @@ import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java index 4ea662db956..de213d45214 100644 --- a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java +++ b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.ExileZone; import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java b/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java index 567bf435177..1b8a61a9184 100644 --- a/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java +++ b/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FierceEmpath.java b/Mage.Sets/src/mage/cards/f/FierceEmpath.java index 4a476ee0182..ff93255b9c9 100644 --- a/Mage.Sets/src/mage/cards/f/FierceEmpath.java +++ b/Mage.Sets/src/mage/cards/f/FierceEmpath.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FierceInvocation.java b/Mage.Sets/src/mage/cards/f/FierceInvocation.java index f44abaa3d4d..86854301fb6 100644 --- a/Mage.Sets/src/mage/cards/f/FierceInvocation.java +++ b/Mage.Sets/src/mage/cards/f/FierceInvocation.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FieryBombardment.java b/Mage.Sets/src/mage/cards/f/FieryBombardment.java index a7c51fa2b13..38b1df72f04 100644 --- a/Mage.Sets/src/mage/cards/f/FieryBombardment.java +++ b/Mage.Sets/src/mage/cards/f/FieryBombardment.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FieryConclusion.java b/Mage.Sets/src/mage/cards/f/FieryConclusion.java index d087cd0b956..dc4916faa8d 100644 --- a/Mage.Sets/src/mage/cards/f/FieryConclusion.java +++ b/Mage.Sets/src/mage/cards/f/FieryConclusion.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FieryConfluence.java b/Mage.Sets/src/mage/cards/f/FieryConfluence.java index c9bb9517a8a..e0823a57a98 100644 --- a/Mage.Sets/src/mage/cards/f/FieryConfluence.java +++ b/Mage.Sets/src/mage/cards/f/FieryConfluence.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DamagePlayersEffect; @@ -39,6 +38,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FieryFall.java b/Mage.Sets/src/mage/cards/f/FieryFall.java index b7e4be55f44..06ada76b9ee 100644 --- a/Mage.Sets/src/mage/cards/f/FieryFall.java +++ b/Mage.Sets/src/mage/cards/f/FieryFall.java @@ -28,15 +28,16 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.BasicLandcyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FieryGambit.java b/Mage.Sets/src/mage/cards/f/FieryGambit.java index ec7858b2d34..7bbd3dcc3ee 100644 --- a/Mage.Sets/src/mage/cards/f/FieryGambit.java +++ b/Mage.Sets/src/mage/cards/f/FieryGambit.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FieryHellhound.java b/Mage.Sets/src/mage/cards/f/FieryHellhound.java index e1882798ae2..f9b984e50b8 100644 --- a/Mage.Sets/src/mage/cards/f/FieryHellhound.java +++ b/Mage.Sets/src/mage/cards/f/FieryHellhound.java @@ -28,16 +28,17 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FieryImpulse.java b/Mage.Sets/src/mage/cards/f/FieryImpulse.java index e848725aa15..c0eff83ebd9 100644 --- a/Mage.Sets/src/mage/cards/f/FieryImpulse.java +++ b/Mage.Sets/src/mage/cards/f/FieryImpulse.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.SpellMasteryCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FieryJustice.java b/Mage.Sets/src/mage/cards/f/FieryJustice.java index 18b279736a2..1e6a822d2fa 100644 --- a/Mage.Sets/src/mage/cards/f/FieryJustice.java +++ b/Mage.Sets/src/mage/cards/f/FieryJustice.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; import mage.abilities.effects.common.GainLifeTargetEffect; @@ -38,6 +37,8 @@ import mage.target.common.TargetCreatureOrPlayerAmount; import mage.target.common.TargetOpponent; import mage.target.targetpointer.SecondTargetPointer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FieryMantle.java b/Mage.Sets/src/mage/cards/f/FieryMantle.java index 161fcf3fdf6..c664b1c0d6f 100644 --- a/Mage.Sets/src/mage/cards/f/FieryMantle.java +++ b/Mage.Sets/src/mage/cards/f/FieryMantle.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,14 +37,12 @@ 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.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FieryTemper.java b/Mage.Sets/src/mage/cards/f/FieryTemper.java index 8f7401b8436..83efceef299 100644 --- a/Mage.Sets/src/mage/cards/f/FieryTemper.java +++ b/Mage.Sets/src/mage/cards/f/FieryTemper.java @@ -27,12 +27,12 @@ */ package mage.cards.f; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FightToTheDeath.java b/Mage.Sets/src/mage/cards/f/FightToTheDeath.java index be38a63b2bd..5cdb22ffaad 100644 --- a/Mage.Sets/src/mage/cards/f/FightToTheDeath.java +++ b/Mage.Sets/src/mage/cards/f/FightToTheDeath.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.BlockedPredicate; import mage.filter.predicate.permanent.BlockingPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FightingDrake.java b/Mage.Sets/src/mage/cards/f/FightingDrake.java index 1cd664393bd..c4ac924d429 100644 --- a/Mage.Sets/src/mage/cards/f/FightingDrake.java +++ b/Mage.Sets/src/mage/cards/f/FightingDrake.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java b/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java index cbae20c4e5f..1a7b5e05182 100644 --- a/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java +++ b/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.LockedInCondition; @@ -46,6 +45,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FiligreeAngel.java b/Mage.Sets/src/mage/cards/f/FiligreeAngel.java index b230783c704..8cdddedd393 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeAngel.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeAngel.java @@ -28,9 +28,6 @@ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -45,6 +43,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FiligreeCrawler.java b/Mage.Sets/src/mage/cards/f/FiligreeCrawler.java index d80d478497d..c2dc259cccd 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeCrawler.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeCrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ThopterColorlessToken; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FiligreeFamiliar.java b/Mage.Sets/src/mage/cards/f/FiligreeFamiliar.java index 9f346ab8aa7..4e142f69811 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeFamiliar.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeFamiliar.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FiligreeFracture.java b/Mage.Sets/src/mage/cards/f/FiligreeFracture.java index b56c100d113..0ca22a469f5 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeFracture.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeFracture.java @@ -27,21 +27,22 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FiligreeSages.java b/Mage.Sets/src/mage/cards/f/FiligreeSages.java index aa8023959fb..c0cc77616d7 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeSages.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeSages.java @@ -28,9 +28,6 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +35,14 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FillWithFright.java b/Mage.Sets/src/mage/cards/f/FillWithFright.java index 72e6fa33e21..622b8439e9b 100644 --- a/Mage.Sets/src/mage/cards/f/FillWithFright.java +++ b/Mage.Sets/src/mage/cards/f/FillWithFright.java @@ -27,14 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/Filth.java b/Mage.Sets/src/mage/cards/f/Filth.java index a7406de7066..575f65a13c0 100644 --- a/Mage.Sets/src/mage/cards/f/Filth.java +++ b/Mage.Sets/src/mage/cards/f/Filth.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -38,6 +36,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/f/FilthyCur.java b/Mage.Sets/src/mage/cards/f/FilthyCur.java index 6b4be753d04..1fb134af14d 100644 --- a/Mage.Sets/src/mage/cards/f/FilthyCur.java +++ b/Mage.Sets/src/mage/cards/f/FilthyCur.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/f/FinalFortune.java b/Mage.Sets/src/mage/cards/f/FinalFortune.java index efca6727105..930e389999c 100644 --- a/Mage.Sets/src/mage/cards/f/FinalFortune.java +++ b/Mage.Sets/src/mage/cards/f/FinalFortune.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FinalIteration.java b/Mage.Sets/src/mage/cards/f/FinalIteration.java index d151a1d28ff..47404474c2a 100644 --- a/Mage.Sets/src/mage/cards/f/FinalIteration.java +++ b/Mage.Sets/src/mage/cards/f/FinalIteration.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -51,6 +50,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.HumanWizardToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FinalJudgment.java b/Mage.Sets/src/mage/cards/f/FinalJudgment.java index 32764221f9e..331ef845263 100644 --- a/Mage.Sets/src/mage/cards/f/FinalJudgment.java +++ b/Mage.Sets/src/mage/cards/f/FinalJudgment.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.ExileAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FinalPunishment.java b/Mage.Sets/src/mage/cards/f/FinalPunishment.java index 33f9643b669..add38726130 100644 --- a/Mage.Sets/src/mage/cards/f/FinalPunishment.java +++ b/Mage.Sets/src/mage/cards/f/FinalPunishment.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.target.TargetPlayer; import mage.watchers.common.AmountOfDamageAPlayerReceivedThisTurnWatcher; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FinalRevels.java b/Mage.Sets/src/mage/cards/f/FinalRevels.java index fad298c5d05..4866a014007 100644 --- a/Mage.Sets/src/mage/cards/f/FinalRevels.java +++ b/Mage.Sets/src/mage/cards/f/FinalRevels.java @@ -27,11 +27,11 @@ */ package mage.cards.f; -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/f/FinalStingFaerie.java b/Mage.Sets/src/mage/cards/f/FinalStingFaerie.java index c9e63f14745..7467028140b 100644 --- a/Mage.Sets/src/mage/cards/f/FinalStingFaerie.java +++ b/Mage.Sets/src/mage/cards/f/FinalStingFaerie.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FinalStrike.java b/Mage.Sets/src/mage/cards/f/FinalStrike.java index 3a1fdbe7b28..068c3adf73c 100644 --- a/Mage.Sets/src/mage/cards/f/FinalStrike.java +++ b/Mage.Sets/src/mage/cards/f/FinalStrike.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.dynamicvalue.common.SacrificeCostCreaturesPower; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FinestHour.java b/Mage.Sets/src/mage/cards/f/FinestHour.java index a1efbcbeb76..b5f9b0be6cb 100644 --- a/Mage.Sets/src/mage/cards/f/FinestHour.java +++ b/Mage.Sets/src/mage/cards/f/FinestHour.java @@ -28,7 +28,6 @@ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.game.turn.TurnMod; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FireAmbush.java b/Mage.Sets/src/mage/cards/f/FireAmbush.java index e5f6abd191e..8311b297204 100644 --- a/Mage.Sets/src/mage/cards/f/FireAmbush.java +++ b/Mage.Sets/src/mage/cards/f/FireAmbush.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FireAnts.java b/Mage.Sets/src/mage/cards/f/FireAnts.java index 7a89f681fb7..720a404bb51 100644 --- a/Mage.Sets/src/mage/cards/f/FireAnts.java +++ b/Mage.Sets/src/mage/cards/f/FireAnts.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FireAtWill.java b/Mage.Sets/src/mage/cards/f/FireAtWill.java index 91856964581..b87603cb27b 100644 --- a/Mage.Sets/src/mage/cards/f/FireAtWill.java +++ b/Mage.Sets/src/mage/cards/f/FireAtWill.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.BlockingPredicate; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FireBellyChangeling.java b/Mage.Sets/src/mage/cards/f/FireBellyChangeling.java index 08844565a83..444b8a37b21 100644 --- a/Mage.Sets/src/mage/cards/f/FireBellyChangeling.java +++ b/Mage.Sets/src/mage/cards/f/FireBellyChangeling.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/f/FireBowman.java b/Mage.Sets/src/mage/cards/f/FireBowman.java index 124ceb3768d..e56437c5cef 100644 --- a/Mage.Sets/src/mage/cards/f/FireBowman.java +++ b/Mage.Sets/src/mage/cards/f/FireBowman.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FireDiamond.java b/Mage.Sets/src/mage/cards/f/FireDiamond.java index 03257218452..2c3bb3d9a9a 100644 --- a/Mage.Sets/src/mage/cards/f/FireDiamond.java +++ b/Mage.Sets/src/mage/cards/f/FireDiamond.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FireDragon.java b/Mage.Sets/src/mage/cards/f/FireDragon.java index 5c442824f95..a12edf7cd41 100644 --- a/Mage.Sets/src/mage/cards/f/FireDragon.java +++ b/Mage.Sets/src/mage/cards/f/FireDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FireDrake.java b/Mage.Sets/src/mage/cards/f/FireDrake.java index 83bad1e7308..83cdda52f7b 100644 --- a/Mage.Sets/src/mage/cards/f/FireDrake.java +++ b/Mage.Sets/src/mage/cards/f/FireDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FireElemental.java b/Mage.Sets/src/mage/cards/f/FireElemental.java index b3289844def..dcf6832e15d 100644 --- a/Mage.Sets/src/mage/cards/f/FireElemental.java +++ b/Mage.Sets/src/mage/cards/f/FireElemental.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FireFieldOgre.java b/Mage.Sets/src/mage/cards/f/FireFieldOgre.java index 4cd5655e106..5e304097e4b 100644 --- a/Mage.Sets/src/mage/cards/f/FireFieldOgre.java +++ b/Mage.Sets/src/mage/cards/f/FireFieldOgre.java @@ -27,14 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FireIce.java b/Mage.Sets/src/mage/cards/f/FireIce.java index 4f30e41ebc1..44caebc9b2e 100644 --- a/Mage.Sets/src/mage/cards/f/FireIce.java +++ b/Mage.Sets/src/mage/cards/f/FireIce.java @@ -28,17 +28,18 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardSetInfo; import mage.cards.SplitCard; +import mage.constants.CardType; import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FireImp.java b/Mage.Sets/src/mage/cards/f/FireImp.java index ad5d25d926a..4c914834d9d 100644 --- a/Mage.Sets/src/mage/cards/f/FireImp.java +++ b/Mage.Sets/src/mage/cards/f/FireImp.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FireJuggler.java b/Mage.Sets/src/mage/cards/f/FireJuggler.java index 5e57056ff0d..a4404367c55 100644 --- a/Mage.Sets/src/mage/cards/f/FireJuggler.java +++ b/Mage.Sets/src/mage/cards/f/FireJuggler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/f/FireLitThicket.java b/Mage.Sets/src/mage/cards/f/FireLitThicket.java index b61b728994d..df872a1ce0f 100644 --- a/Mage.Sets/src/mage/cards/f/FireLitThicket.java +++ b/Mage.Sets/src/mage/cards/f/FireLitThicket.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FireServant.java b/Mage.Sets/src/mage/cards/f/FireServant.java index 8b52c1977e8..fea0225efc8 100644 --- a/Mage.Sets/src/mage/cards/f/FireServant.java +++ b/Mage.Sets/src/mage/cards/f/FireServant.java @@ -28,7 +28,6 @@ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.StackObject; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FireSnake.java b/Mage.Sets/src/mage/cards/f/FireSnake.java index 3a4fad38d85..a6beebfdf11 100644 --- a/Mage.Sets/src/mage/cards/f/FireSnake.java +++ b/Mage.Sets/src/mage/cards/f/FireSnake.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FireSprites.java b/Mage.Sets/src/mage/cards/f/FireSprites.java index d6dad894708..6cfe20293c9 100644 --- a/Mage.Sets/src/mage/cards/f/FireSprites.java +++ b/Mage.Sets/src/mage/cards/f/FireSprites.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/f/FireTempest.java b/Mage.Sets/src/mage/cards/f/FireTempest.java index 116e2557e97..af3e03e3f3e 100644 --- a/Mage.Sets/src/mage/cards/f/FireTempest.java +++ b/Mage.Sets/src/mage/cards/f/FireTempest.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author ilcartographer diff --git a/Mage.Sets/src/mage/cards/f/FireWhip.java b/Mage.Sets/src/mage/cards/f/FireWhip.java index e3a9cdbcb1a..dd08a420e04 100644 --- a/Mage.Sets/src/mage/cards/f/FireWhip.java +++ b/Mage.Sets/src/mage/cards/f/FireWhip.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,15 +38,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/Fireblast.java b/Mage.Sets/src/mage/cards/f/Fireblast.java index f09518baa4e..fecd1ee3154 100644 --- a/Mage.Sets/src/mage/cards/f/Fireblast.java +++ b/Mage.Sets/src/mage/cards/f/Fireblast.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/Firebolt.java b/Mage.Sets/src/mage/cards/f/Firebolt.java index 10d787f2680..f47271065b9 100644 --- a/Mage.Sets/src/mage/cards/f/Firebolt.java +++ b/Mage.Sets/src/mage/cards/f/Firebolt.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlashbackAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java index e51956c04f0..f38b535482a 100644 --- a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java +++ b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/Firebreathing.java b/Mage.Sets/src/mage/cards/f/Firebreathing.java index 5ddbf61e338..c01e4f59a0e 100644 --- a/Mage.Sets/src/mage/cards/f/Firebreathing.java +++ b/Mage.Sets/src/mage/cards/f/Firebreathing.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -36,14 +35,12 @@ 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.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FirecatBlitz.java b/Mage.Sets/src/mage/cards/f/FirecatBlitz.java index a9be479a0c0..9e0e6216ca4 100644 --- a/Mage.Sets/src/mage/cards/f/FirecatBlitz.java +++ b/Mage.Sets/src/mage/cards/f/FirecatBlitz.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -54,6 +53,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FiredrinkerSatyr.java b/Mage.Sets/src/mage/cards/f/FiredrinkerSatyr.java index cf96572ae41..5cd462f8b73 100644 --- a/Mage.Sets/src/mage/cards/f/FiredrinkerSatyr.java +++ b/Mage.Sets/src/mage/cards/f/FiredrinkerSatyr.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; @@ -46,6 +45,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FirefiendElemental.java b/Mage.Sets/src/mage/cards/f/FirefiendElemental.java index f6a7f50cc30..817da848678 100644 --- a/Mage.Sets/src/mage/cards/f/FirefiendElemental.java +++ b/Mage.Sets/src/mage/cards/f/FirefiendElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.RenownAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FirefistStriker.java b/Mage.Sets/src/mage/cards/f/FirefistStriker.java index 5e78d9f2442..e0774d8dee8 100644 --- a/Mage.Sets/src/mage/cards/f/FirefistStriker.java +++ b/Mage.Sets/src/mage/cards/f/FirefistStriker.java @@ -28,17 +28,18 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.abilities.keyword.BattalionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Firefly.java b/Mage.Sets/src/mage/cards/f/Firefly.java index ea488445780..08369ba614e 100644 --- a/Mage.Sets/src/mage/cards/f/Firefly.java +++ b/Mage.Sets/src/mage/cards/f/Firefly.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -37,6 +34,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java index 7b814d3ff6f..bd067bd7435 100644 --- a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FirefrightMage.java b/Mage.Sets/src/mage/cards/f/FirefrightMage.java index f0dd8881e31..89a02052e20 100644 --- a/Mage.Sets/src/mage/cards/f/FirefrightMage.java +++ b/Mage.Sets/src/mage/cards/f/FirefrightMage.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java b/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java index cce833cf9cd..47270f820ef 100644 --- a/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java +++ b/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FiremaneAngel.java b/Mage.Sets/src/mage/cards/f/FiremaneAngel.java index 4d766e4b931..a172b2286f7 100644 --- a/Mage.Sets/src/mage/cards/f/FiremaneAngel.java +++ b/Mage.Sets/src/mage/cards/f/FiremaneAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -48,6 +47,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java b/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java index 685b7e08c0b..0e7bdce1e31 100644 --- a/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java +++ b/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.DamageTargetEffect; @@ -37,8 +35,11 @@ import mage.abilities.keyword.BattalionAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FiremantleMage.java b/Mage.Sets/src/mage/cards/f/FiremantleMage.java index 634130f610e..7857bd999a9 100644 --- a/Mage.Sets/src/mage/cards/f/FiremantleMage.java +++ b/Mage.Sets/src/mage/cards/f/FiremantleMage.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FiremawKavu.java b/Mage.Sets/src/mage/cards/f/FiremawKavu.java index 73d3f97d060..15c15de2d1c 100644 --- a/Mage.Sets/src/mage/cards/f/FiremawKavu.java +++ b/Mage.Sets/src/mage/cards/f/FiremawKavu.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FiremindsForesight.java b/Mage.Sets/src/mage/cards/f/FiremindsForesight.java index 4887ea76043..45ac63f4335 100644 --- a/Mage.Sets/src/mage/cards/f/FiremindsForesight.java +++ b/Mage.Sets/src/mage/cards/f/FiremindsForesight.java @@ -27,17 +27,11 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; @@ -47,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java b/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java index 225c1b19de3..35911ef2835 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java @@ -27,16 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TimingRule; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TimingRule; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java index 515756c2a02..757fe53051f 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,10 +36,16 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki, nantuko diff --git a/Mage.Sets/src/mage/cards/f/Firescreamer.java b/Mage.Sets/src/mage/cards/f/Firescreamer.java index 52d3bec4981..fef62c4739a 100644 --- a/Mage.Sets/src/mage/cards/f/Firescreamer.java +++ b/Mage.Sets/src/mage/cards/f/Firescreamer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/f/Fireshrieker.java b/Mage.Sets/src/mage/cards/f/Fireshrieker.java index fea5f332f1b..2c0ca33a5be 100644 --- a/Mage.Sets/src/mage/cards/f/Fireshrieker.java +++ b/Mage.Sets/src/mage/cards/f/Fireshrieker.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Fireslinger.java b/Mage.Sets/src/mage/cards/f/Fireslinger.java index 9410e62e500..1effdb1583d 100644 --- a/Mage.Sets/src/mage/cards/f/Fireslinger.java +++ b/Mage.Sets/src/mage/cards/f/Fireslinger.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Firespout.java b/Mage.Sets/src/mage/cards/f/Firespout.java index cbf6db7e979..699dc61fa9a 100644 --- a/Mage.Sets/src/mage/cards/f/Firespout.java +++ b/Mage.Sets/src/mage/cards/f/Firespout.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageAllEffect; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.watchers.common.ManaSpentToCastWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FirestormHellkite.java b/Mage.Sets/src/mage/cards/f/FirestormHellkite.java index 0215fc29e7d..1fb8fe1813f 100644 --- a/Mage.Sets/src/mage/cards/f/FirestormHellkite.java +++ b/Mage.Sets/src/mage/cards/f/FirestormHellkite.java @@ -27,16 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.TrampleAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CumulativeUpkeepAbility; +import mage.abilities.keyword.FlyingAbility; +import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java index 922027b5c26..784bbe1ced5 100644 --- a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java +++ b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FirewildBorderpost.java b/Mage.Sets/src/mage/cards/f/FirewildBorderpost.java index f913208cec7..7ef953996ca 100644 --- a/Mage.Sets/src/mage/cards/f/FirewildBorderpost.java +++ b/Mage.Sets/src/mage/cards/f/FirewildBorderpost.java @@ -28,7 +28,6 @@ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostSourceAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FirewingPhoenix.java b/Mage.Sets/src/mage/cards/f/FirewingPhoenix.java index 30cedd70380..80b082475c3 100644 --- a/Mage.Sets/src/mage/cards/f/FirewingPhoenix.java +++ b/Mage.Sets/src/mage/cards/f/FirewingPhoenix.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FirstResponse.java b/Mage.Sets/src/mage/cards/f/FirstResponse.java index c04c08a759b..41210761f68 100644 --- a/Mage.Sets/src/mage/cards/f/FirstResponse.java +++ b/Mage.Sets/src/mage/cards/f/FirstResponse.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.token.SoldierToken; import mage.watchers.common.PlayerLostLifeWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FirstVolley.java b/Mage.Sets/src/mage/cards/f/FirstVolley.java index b18caa5de14..f0cc5991241 100644 --- a/Mage.Sets/src/mage/cards/f/FirstVolley.java +++ b/Mage.Sets/src/mage/cards/f/FirstVolley.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FishliverOil.java b/Mage.Sets/src/mage/cards/f/FishliverOil.java index 7733efa521c..d9bcda7510f 100644 --- a/Mage.Sets/src/mage/cards/f/FishliverOil.java +++ b/Mage.Sets/src/mage/cards/f/FishliverOil.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Laxika */ diff --git a/Mage.Sets/src/mage/cards/f/Fissure.java b/Mage.Sets/src/mage/cards/f/Fissure.java index f077970f186..6d23531e36e 100644 --- a/Mage.Sets/src/mage/cards/f/Fissure.java +++ b/Mage.Sets/src/mage/cards/f/Fissure.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -38,6 +37,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Jgod diff --git a/Mage.Sets/src/mage/cards/f/FissureVent.java b/Mage.Sets/src/mage/cards/f/FissureVent.java index 873f35a75ca..1aa0c32171e 100644 --- a/Mage.Sets/src/mage/cards/f/FissureVent.java +++ b/Mage.Sets/src/mage/cards/f/FissureVent.java @@ -27,15 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FistOfSuns.java b/Mage.Sets/src/mage/cards/f/FistOfSuns.java index c3928f05d04..e9e20ee51c1 100644 --- a/Mage.Sets/src/mage/cards/f/FistOfSuns.java +++ b/Mage.Sets/src/mage/cards/f/FistOfSuns.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceIsSpellCondition; @@ -36,15 +35,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FistfulOfForce.java b/Mage.Sets/src/mage/cards/f/FistfulOfForce.java index 6b5dbe70c19..3181a5c7873 100644 --- a/Mage.Sets/src/mage/cards/f/FistfulOfForce.java +++ b/Mage.Sets/src/mage/cards/f/FistfulOfForce.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java index 2ae42c78026..c4d7232a343 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,10 +37,16 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.permanent.token.SaprolingToken; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FistsOfTheAnvil.java b/Mage.Sets/src/mage/cards/f/FistsOfTheAnvil.java index 4f04bf1d22c..b635c5e28de 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfTheAnvil.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfTheAnvil.java @@ -27,15 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java b/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java index c4cc3add29a..4d11c1e8e56 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FitOfRage.java b/Mage.Sets/src/mage/cards/f/FitOfRage.java index be79914d482..922fa831cd7 100644 --- a/Mage.Sets/src/mage/cards/f/FitOfRage.java +++ b/Mage.Sets/src/mage/cards/f/FitOfRage.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java index 9340a64f307..21557888024 100644 --- a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java +++ b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.HashSet; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +46,9 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.HashSet; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java b/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java index 8b60fd861a9..b2d44a7e737 100644 --- a/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java +++ b/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java @@ -27,17 +27,19 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +54,7 @@ public class FlagstonesOfTrokair extends CardImpl { public FlagstonesOfTrokair(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {W} to your mana pool. this.addAbility(new WhiteManaAbility()); diff --git a/Mage.Sets/src/mage/cards/f/FlailingDrake.java b/Mage.Sets/src/mage/cards/f/FlailingDrake.java index 2297de3860a..c574d375f22 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingDrake.java +++ b/Mage.Sets/src/mage/cards/f/FlailingDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/f/FlailingManticore.java b/Mage.Sets/src/mage/cards/f/FlailingManticore.java index 98da1455b2a..2975f7c80e3 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingManticore.java +++ b/Mage.Sets/src/mage/cards/f/FlailingManticore.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlailingOgre.java b/Mage.Sets/src/mage/cards/f/FlailingOgre.java index 9cfa6782ae7..4a41120ad04 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingOgre.java +++ b/Mage.Sets/src/mage/cards/f/FlailingOgre.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlailingSoldier.java b/Mage.Sets/src/mage/cards/f/FlailingSoldier.java index 76fe9c34ff6..c606ffdf1f2 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingSoldier.java +++ b/Mage.Sets/src/mage/cards/f/FlailingSoldier.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlameBurst.java b/Mage.Sets/src/mage/cards/f/FlameBurst.java index 748c46b15d9..fe6efdf0ed1 100644 --- a/Mage.Sets/src/mage/cards/f/FlameBurst.java +++ b/Mage.Sets/src/mage/cards/f/FlameBurst.java @@ -27,13 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.InfoEffect; import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.effects.common.InfoEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlameFusillade.java b/Mage.Sets/src/mage/cards/f/FlameFusillade.java index 57dbc20cb9a..605f4aea7de 100644 --- a/Mage.Sets/src/mage/cards/f/FlameFusillade.java +++ b/Mage.Sets/src/mage/cards/f/FlameFusillade.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,10 +34,13 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FlameJab.java b/Mage.Sets/src/mage/cards/f/FlameJab.java index 1fbf623a355..10a87d5600e 100644 --- a/Mage.Sets/src/mage/cards/f/FlameJab.java +++ b/Mage.Sets/src/mage/cards/f/FlameJab.java @@ -27,15 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FlameJavelin.java b/Mage.Sets/src/mage/cards/f/FlameJavelin.java index 4cba69787e0..f6c4dd9bcad 100644 --- a/Mage.Sets/src/mage/cards/f/FlameJavelin.java +++ b/Mage.Sets/src/mage/cards/f/FlameJavelin.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FlameJet.java b/Mage.Sets/src/mage/cards/f/FlameJet.java index a8d8683f7a4..5fc39f4663a 100644 --- a/Mage.Sets/src/mage/cards/f/FlameJet.java +++ b/Mage.Sets/src/mage/cards/f/FlameJet.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.CyclingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlameKinZealot.java b/Mage.Sets/src/mage/cards/f/FlameKinZealot.java index 9737fae86df..e39b221d754 100644 --- a/Mage.Sets/src/mage/cards/f/FlameKinZealot.java +++ b/Mage.Sets/src/mage/cards/f/FlameKinZealot.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FlameLash.java b/Mage.Sets/src/mage/cards/f/FlameLash.java index f23eb71205f..d15b17e894d 100644 --- a/Mage.Sets/src/mage/cards/f/FlameLash.java +++ b/Mage.Sets/src/mage/cards/f/FlameLash.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlameRift.java b/Mage.Sets/src/mage/cards/f/FlameRift.java index 105f1b70518..2e3f7f35600 100644 --- a/Mage.Sets/src/mage/cards/f/FlameRift.java +++ b/Mage.Sets/src/mage/cards/f/FlameRift.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamagePlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlameSlash.java b/Mage.Sets/src/mage/cards/f/FlameSlash.java index 217dd12964a..c1e1f3092fe 100644 --- a/Mage.Sets/src/mage/cards/f/FlameSlash.java +++ b/Mage.Sets/src/mage/cards/f/FlameSlash.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FlameSpirit.java b/Mage.Sets/src/mage/cards/f/FlameSpirit.java index 726385af9da..4f730e82849 100644 --- a/Mage.Sets/src/mage/cards/f/FlameSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FlameSpirit.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FlameWave.java b/Mage.Sets/src/mage/cards/f/FlameWave.java index 8e770851c64..6f5f06f228f 100644 --- a/Mage.Sets/src/mage/cards/f/FlameWave.java +++ b/Mage.Sets/src/mage/cards/f/FlameWave.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageAllControlledTargetEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlameWreathedPhoenix.java b/Mage.Sets/src/mage/cards/f/FlameWreathedPhoenix.java index 36edda4f203..1a61f596971 100644 --- a/Mage.Sets/src/mage/cards/f/FlameWreathedPhoenix.java +++ b/Mage.Sets/src/mage/cards/f/FlameWreathedPhoenix.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; @@ -45,6 +44,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamebladeAngel.java b/Mage.Sets/src/mage/cards/f/FlamebladeAngel.java index db45920d0e7..52a04c97916 100644 --- a/Mage.Sets/src/mage/cards/f/FlamebladeAngel.java +++ b/Mage.Sets/src/mage/cards/f/FlamebladeAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -42,6 +41,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java index 879e36fc073..9fcd605f788 100644 --- a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java +++ b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/f/FlamebornHellion.java b/Mage.Sets/src/mage/cards/f/FlamebornHellion.java index ee8d857b4d2..e4921f44b9c 100644 --- a/Mage.Sets/src/mage/cards/f/FlamebornHellion.java +++ b/Mage.Sets/src/mage/cards/f/FlamebornHellion.java @@ -28,13 +28,14 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FlamebornViron.java b/Mage.Sets/src/mage/cards/f/FlamebornViron.java index 46febac3cdf..4e1d70fd5ca 100644 --- a/Mage.Sets/src/mage/cards/f/FlamebornViron.java +++ b/Mage.Sets/src/mage/cards/f/FlamebornViron.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/Flamebreak.java b/Mage.Sets/src/mage/cards/f/Flamebreak.java index 2c918ceafd7..f702ee66cf8 100644 --- a/Mage.Sets/src/mage/cards/f/Flamebreak.java +++ b/Mage.Sets/src/mage/cards/f/Flamebreak.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamecastWheel.java b/Mage.Sets/src/mage/cards/f/FlamecastWheel.java index 34506b0ffda..f8c7a4077ac 100644 --- a/Mage.Sets/src/mage/cards/f/FlamecastWheel.java +++ b/Mage.Sets/src/mage/cards/f/FlamecastWheel.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamecoreElemental.java b/Mage.Sets/src/mage/cards/f/FlamecoreElemental.java index a7830435728..d830615ac17 100644 --- a/Mage.Sets/src/mage/cards/f/FlamecoreElemental.java +++ b/Mage.Sets/src/mage/cards/f/FlamecoreElemental.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlameheartWerewolf.java b/Mage.Sets/src/mage/cards/f/FlameheartWerewolf.java index 5c249df45a0..539f68415db 100644 --- a/Mage.Sets/src/mage/cards/f/FlameheartWerewolf.java +++ b/Mage.Sets/src/mage/cards/f/FlameheartWerewolf.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java b/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java index 171296bcd4e..51336d214df 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java @@ -27,18 +27,19 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.OrCost; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.costs.mana.GenericManaCost; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java b/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java index 91f3e3ec101..6f0ec605f58 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java @@ -27,13 +27,16 @@ */ package mage.cards.f; -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FlamekinHarbinger.java b/Mage.Sets/src/mage/cards/f/FlamekinHarbinger.java index 2eaa57b2487..f603a171849 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinHarbinger.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinHarbinger.java @@ -27,17 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java index 530b045cb4f..e194a1af189 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -35,6 +34,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java index c1d344a3f48..8efde2f5ff4 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamerushRider.java b/Mage.Sets/src/mage/cards/f/FlamerushRider.java index d9f816482aa..69e9a3ab688 100644 --- a/Mage.Sets/src/mage/cards/f/FlamerushRider.java +++ b/Mage.Sets/src/mage/cards/f/FlamerushRider.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -51,6 +50,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java index 6b9314a12bd..2615a726b9d 100644 --- a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java +++ b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -43,18 +40,17 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.players.Library; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FlamesOfTheBloodHand.java b/Mage.Sets/src/mage/cards/f/FlamesOfTheBloodHand.java index 3613deb3cf3..c96bcae6a66 100644 --- a/Mage.Sets/src/mage/cards/f/FlamesOfTheBloodHand.java +++ b/Mage.Sets/src/mage/cards/f/FlamesOfTheBloodHand.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java b/Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java index bffd1fd1bef..3935175dbf3 100644 --- a/Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java index 58a3194e856..d2e69c46716 100644 --- a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java +++ b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/Flameshot.java b/Mage.Sets/src/mage/cards/f/Flameshot.java index f89f6057f8f..89d543fb4f5 100644 --- a/Mage.Sets/src/mage/cards/f/Flameshot.java +++ b/Mage.Sets/src/mage/cards/f/Flameshot.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.DamageMultiEffect; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlamespeakerAdept.java b/Mage.Sets/src/mage/cards/f/FlamespeakerAdept.java index 49dcc46ae6a..06f6c0ec520 100644 --- a/Mage.Sets/src/mage/cards/f/FlamespeakerAdept.java +++ b/Mage.Sets/src/mage/cards/f/FlamespeakerAdept.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java b/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java index 72a6f521ccb..c87e35a5c7a 100644 --- a/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java +++ b/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,15 +38,13 @@ 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.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java index 9d67a4a4b7d..13a15e2e79f 100644 --- a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java +++ b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlametongueKavu.java b/Mage.Sets/src/mage/cards/f/FlametongueKavu.java index 6be638f7972..1c404590b97 100644 --- a/Mage.Sets/src/mage/cards/f/FlametongueKavu.java +++ b/Mage.Sets/src/mage/cards/f/FlametongueKavu.java @@ -27,16 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java b/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java index d032d39a62e..b359b5bc8cf 100644 --- a/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java +++ b/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java b/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java index 4f76fe4af8a..345ed79997c 100644 --- a/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java +++ b/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +34,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Flamewright.java b/Mage.Sets/src/mage/cards/f/Flamewright.java index d909713f34c..aa0b24b753d 100644 --- a/Mage.Sets/src/mage/cards/f/Flamewright.java +++ b/Mage.Sets/src/mage/cards/f/Flamewright.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.token.Token; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlankingTroops.java b/Mage.Sets/src/mage/cards/f/FlankingTroops.java index 0d2b4fe5d04..6ca3bf8f149 100644 --- a/Mage.Sets/src/mage/cards/f/FlankingTroops.java +++ b/Mage.Sets/src/mage/cards/f/FlankingTroops.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Flare.java b/Mage.Sets/src/mage/cards/f/Flare.java index abe661997c5..741aad749d6 100644 --- a/Mage.Sets/src/mage/cards/f/Flare.java +++ b/Mage.Sets/src/mage/cards/f/Flare.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java index 084230acb76..704b7b14f63 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/Flash.java b/Mage.Sets/src/mage/cards/f/Flash.java index 0cf62455aa4..2fd40a12b1c 100644 --- a/Mage.Sets/src/mage/cards/f/Flash.java +++ b/Mage.Sets/src/mage/cards/f/Flash.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCosts; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.common.TargetCardInHand; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FlashCounter.java b/Mage.Sets/src/mage/cards/f/FlashCounter.java index 4a8362d97a0..8aff7ba3ad6 100644 --- a/Mage.Sets/src/mage/cards/f/FlashCounter.java +++ b/Mage.Sets/src/mage/cards/f/FlashCounter.java @@ -27,15 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FlashFlood.java b/Mage.Sets/src/mage/cards/f/FlashFlood.java index ff3e553148b..d372d731f28 100644 --- a/Mage.Sets/src/mage/cards/f/FlashFlood.java +++ b/Mage.Sets/src/mage/cards/f/FlashFlood.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlashOfDefiance.java b/Mage.Sets/src/mage/cards/f/FlashOfDefiance.java index 419047967e5..187c72c1b31 100644 --- a/Mage.Sets/src/mage/cards/f/FlashOfDefiance.java +++ b/Mage.Sets/src/mage/cards/f/FlashOfDefiance.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.costs.common.PayLifeCost; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlashOfInsight.java b/Mage.Sets/src/mage/cards/f/FlashOfInsight.java index 96ddbbdb2b1..b1852d3e703 100644 --- a/Mage.Sets/src/mage/cards/f/FlashOfInsight.java +++ b/Mage.Sets/src/mage/cards/f/FlashOfInsight.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; @@ -37,11 +36,7 @@ import mage.abilities.costs.common.ExileXFromYourGraveCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlashbackAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TimingRule; @@ -54,6 +49,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Flashfires.java b/Mage.Sets/src/mage/cards/f/Flashfires.java index fe4805100c3..b4e1d1f174a 100644 --- a/Mage.Sets/src/mage/cards/f/Flashfires.java +++ b/Mage.Sets/src/mage/cards/f/Flashfires.java @@ -27,14 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/Flashfreeze.java b/Mage.Sets/src/mage/cards/f/Flashfreeze.java index 05641189916..f10ca891a88 100644 --- a/Mage.Sets/src/mage/cards/f/Flashfreeze.java +++ b/Mage.Sets/src/mage/cards/f/Flashfreeze.java @@ -28,17 +28,18 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/Flatten.java b/Mage.Sets/src/mage/cards/f/Flatten.java index 82706570548..3490d4bf812 100644 --- a/Mage.Sets/src/mage/cards/f/Flatten.java +++ b/Mage.Sets/src/mage/cards/f/Flatten.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlayerDrone.java b/Mage.Sets/src/mage/cards/f/FlayerDrone.java index 8a395503be7..1bf47336987 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerDrone.java +++ b/Mage.Sets/src/mage/cards/f/FlayerDrone.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlayerHusk.java b/Mage.Sets/src/mage/cards/f/FlayerHusk.java index 6b7b394f803..73c212baa0e 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerHusk.java +++ b/Mage.Sets/src/mage/cards/f/FlayerHusk.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -38,6 +34,11 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.LivingWeaponAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java b/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java index 86e829a90ef..255e6af6590 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java +++ b/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/f/FlayingTendrils.java b/Mage.Sets/src/mage/cards/f/FlayingTendrils.java index b1012af9313..23e7a9a546f 100644 --- a/Mage.Sets/src/mage/cards/f/FlayingTendrils.java +++ b/Mage.Sets/src/mage/cards/f/FlayingTendrils.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -46,6 +45,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FledglingDjinn.java b/Mage.Sets/src/mage/cards/f/FledglingDjinn.java index 2764446bea8..3973a2d964c 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingDjinn.java +++ b/Mage.Sets/src/mage/cards/f/FledglingDjinn.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FledglingDragon.java b/Mage.Sets/src/mage/cards/f/FledglingDragon.java index 79e5e58e4eb..cd33f1b1669 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingDragon.java +++ b/Mage.Sets/src/mage/cards/f/FledglingDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FledglingGriffin.java b/Mage.Sets/src/mage/cards/f/FledglingGriffin.java index 02e247015c4..2777ae48949 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingGriffin.java +++ b/Mage.Sets/src/mage/cards/f/FledglingGriffin.java @@ -28,15 +28,16 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FledglingImp.java b/Mage.Sets/src/mage/cards/f/FledglingImp.java index 3577e09b3db..f790fd54b0b 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingImp.java +++ b/Mage.Sets/src/mage/cards/f/FledglingImp.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java index f5264528570..5753732033b 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java +++ b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java @@ -27,14 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FledglingOsprey.java b/Mage.Sets/src/mage/cards/f/FledglingOsprey.java index 603743b6b5c..ae3ccbc3bab 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingOsprey.java +++ b/Mage.Sets/src/mage/cards/f/FledglingOsprey.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedSourceCondition; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/f/FleecemaneLion.java b/Mage.Sets/src/mage/cards/f/FleecemaneLion.java index 0beb45d628f..65006991466 100644 --- a/Mage.Sets/src/mage/cards/f/FleecemaneLion.java +++ b/Mage.Sets/src/mage/cards/f/FleecemaneLion.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FleetFootedMonk.java b/Mage.Sets/src/mage/cards/f/FleetFootedMonk.java index c87302e9b2d..bb90e383654 100644 --- a/Mage.Sets/src/mage/cards/f/FleetFootedMonk.java +++ b/Mage.Sets/src/mage/cards/f/FleetFootedMonk.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -39,6 +38,8 @@ import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FleetfeatherCockatrice.java b/Mage.Sets/src/mage/cards/f/FleetfeatherCockatrice.java index 56c95e9ed5c..e80021235ed 100644 --- a/Mage.Sets/src/mage/cards/f/FleetfeatherCockatrice.java +++ b/Mage.Sets/src/mage/cards/f/FleetfeatherCockatrice.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlashAbility; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FleetfeatherSandals.java b/Mage.Sets/src/mage/cards/f/FleetfeatherSandals.java index b79e16d70d6..a8934a2773b 100644 --- a/Mage.Sets/src/mage/cards/f/FleetfeatherSandals.java +++ b/Mage.Sets/src/mage/cards/f/FleetfeatherSandals.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -37,11 +36,9 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FleetfootPanther.java b/Mage.Sets/src/mage/cards/f/FleetfootPanther.java index 9af2e51829d..70a3ddc5cbd 100644 --- a/Mage.Sets/src/mage/cards/f/FleetfootPanther.java +++ b/Mage.Sets/src/mage/cards/f/FleetfootPanther.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/f/FleetingDistraction.java b/Mage.Sets/src/mage/cards/f/FleetingDistraction.java index addf68ff7fa..144b81cc115 100644 --- a/Mage.Sets/src/mage/cards/f/FleetingDistraction.java +++ b/Mage.Sets/src/mage/cards/f/FleetingDistraction.java @@ -28,16 +28,16 @@ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FleetingImage.java b/Mage.Sets/src/mage/cards/f/FleetingImage.java index d3cda0224d2..f00068b2f66 100644 --- a/Mage.Sets/src/mage/cards/f/FleetingImage.java +++ b/Mage.Sets/src/mage/cards/f/FleetingImage.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FleetingMemories.java b/Mage.Sets/src/mage/cards/f/FleetingMemories.java index 63b87f97724..1e1b05687d1 100644 --- a/Mage.Sets/src/mage/cards/f/FleetingMemories.java +++ b/Mage.Sets/src/mage/cards/f/FleetingMemories.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FleetwheelCruiser.java b/Mage.Sets/src/mage/cards/f/FleetwheelCruiser.java index d20025445b0..aaef05274c0 100644 --- a/Mage.Sets/src/mage/cards/f/FleetwheelCruiser.java +++ b/Mage.Sets/src/mage/cards/f/FleetwheelCruiser.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/Flensermite.java b/Mage.Sets/src/mage/cards/f/Flensermite.java index 537322389af..02c71edc3a8 100644 --- a/Mage.Sets/src/mage/cards/f/Flensermite.java +++ b/Mage.Sets/src/mage/cards/f/Flensermite.java @@ -28,13 +28,14 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FleshAllergy.java b/Mage.Sets/src/mage/cards/f/FleshAllergy.java index 6d89d970a0e..1251257f4b1 100644 --- a/Mage.Sets/src/mage/cards/f/FleshAllergy.java +++ b/Mage.Sets/src/mage/cards/f/FleshAllergy.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; @@ -49,6 +48,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; import mage.watchers.Watcher; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/f/FleshBlood.java b/Mage.Sets/src/mage/cards/f/FleshBlood.java index 59f370b415e..d3bc9bc9503 100644 --- a/Mage.Sets/src/mage/cards/f/FleshBlood.java +++ b/Mage.Sets/src/mage/cards/f/FleshBlood.java @@ -28,15 +28,14 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardSetInfo; import mage.cards.SplitCard; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -48,6 +47,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FleshCarver.java b/Mage.Sets/src/mage/cards/f/FleshCarver.java index d1742ef88ac..97d246aa96f 100644 --- a/Mage.Sets/src/mage/cards/f/FleshCarver.java +++ b/Mage.Sets/src/mage/cards/f/FleshCarver.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -54,6 +53,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FleshEaterImp.java b/Mage.Sets/src/mage/cards/f/FleshEaterImp.java index d3f2f659537..b6ce8117db4 100644 --- a/Mage.Sets/src/mage/cards/f/FleshEaterImp.java +++ b/Mage.Sets/src/mage/cards/f/FleshEaterImp.java @@ -28,9 +28,6 @@ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,10 +36,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FleshbagMarauder.java b/Mage.Sets/src/mage/cards/f/FleshbagMarauder.java index e22f403d4fc..9aa86fe7f8d 100644 --- a/Mage.Sets/src/mage/cards/f/FleshbagMarauder.java +++ b/Mage.Sets/src/mage/cards/f/FleshbagMarauder.java @@ -27,15 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/f/Fleshformer.java b/Mage.Sets/src/mage/cards/f/Fleshformer.java index e3430b26062..97c5d9e320f 100644 --- a/Mage.Sets/src/mage/cards/f/Fleshformer.java +++ b/Mage.Sets/src/mage/cards/f/Fleshformer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/Fleshgrafter.java b/Mage.Sets/src/mage/cards/f/Fleshgrafter.java index fe6ab881e15..6492a913a34 100644 --- a/Mage.Sets/src/mage/cards/f/Fleshgrafter.java +++ b/Mage.Sets/src/mage/cards/f/Fleshgrafter.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FleshmadSteed.java b/Mage.Sets/src/mage/cards/f/FleshmadSteed.java index db0d2ee11f2..7791662ee76 100644 --- a/Mage.Sets/src/mage/cards/f/FleshmadSteed.java +++ b/Mage.Sets/src/mage/cards/f/FleshmadSteed.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.TapSourceEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FleshpulperGiant.java b/Mage.Sets/src/mage/cards/f/FleshpulperGiant.java index 58620e4c841..14db63f518b 100644 --- a/Mage.Sets/src/mage/cards/f/FleshpulperGiant.java +++ b/Mage.Sets/src/mage/cards/f/FleshpulperGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/Fleshwrither.java b/Mage.Sets/src/mage/cards/f/Fleshwrither.java index 580ef74b32c..ac75906940e 100644 --- a/Mage.Sets/src/mage/cards/f/Fleshwrither.java +++ b/Mage.Sets/src/mage/cards/f/Fleshwrither.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -50,6 +49,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/f/Flicker.java b/Mage.Sets/src/mage/cards/f/Flicker.java index 9ce59c83619..c243fbc820c 100644 --- a/Mage.Sets/src/mage/cards/f/Flicker.java +++ b/Mage.Sets/src/mage/cards/f/Flicker.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java index 4fd952ff719..fb40569ccdc 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerform.java +++ b/Mage.Sets/src/mage/cards/f/Flickerform.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -54,6 +53,8 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlickeringSpirit.java b/Mage.Sets/src/mage/cards/f/FlickeringSpirit.java index ab47d970f22..6a6a8685731 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringSpirit.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlickeringWard.java b/Mage.Sets/src/mage/cards/f/FlickeringWard.java index 04c339f1f3b..1dd4f29f9e1 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringWard.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringWard.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/Flickerwisp.java b/Mage.Sets/src/mage/cards/f/Flickerwisp.java index c406608cefe..0c8d056575a 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerwisp.java +++ b/Mage.Sets/src/mage/cards/f/Flickerwisp.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -49,6 +48,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/Flight.java b/Mage.Sets/src/mage/cards/f/Flight.java index e0a70ee2480..df1f226dce4 100644 --- a/Mage.Sets/src/mage/cards/f/Flight.java +++ b/Mage.Sets/src/mage/cards/f/Flight.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FlightOfFancy.java b/Mage.Sets/src/mage/cards/f/FlightOfFancy.java index 0f5f01832dd..ddc3506e5d1 100644 --- a/Mage.Sets/src/mage/cards/f/FlightOfFancy.java +++ b/Mage.Sets/src/mage/cards/f/FlightOfFancy.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,9 +37,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java index e8b7be5bef7..a237e60ab5c 100644 --- a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java @@ -28,10 +28,6 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,8 +40,13 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Fling.java b/Mage.Sets/src/mage/cards/f/Fling.java index 1286b38e262..e54a2547cf9 100644 --- a/Mage.Sets/src/mage/cards/f/Fling.java +++ b/Mage.Sets/src/mage/cards/f/Fling.java @@ -28,21 +28,22 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java index 7e63a6cac5d..b8e2008a1e8 100644 --- a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,9 +36,14 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java b/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java index b5db599fa7d..e5e972b0d57 100644 --- a/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java +++ b/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Flood.java b/Mage.Sets/src/mage/cards/f/Flood.java index 94bcf86d8f6..725b8366360 100644 --- a/Mage.Sets/src/mage/cards/f/Flood.java +++ b/Mage.Sets/src/mage/cards/f/Flood.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FloodPlain.java b/Mage.Sets/src/mage/cards/f/FloodPlain.java index 02256d2affe..3ebaadca185 100644 --- a/Mage.Sets/src/mage/cards/f/FloodPlain.java +++ b/Mage.Sets/src/mage/cards/f/FloodPlain.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Floodbringer.java b/Mage.Sets/src/mage/cards/f/Floodbringer.java index 8795f6113bc..d2a7404bd18 100644 --- a/Mage.Sets/src/mage/cards/f/Floodbringer.java +++ b/Mage.Sets/src/mage/cards/f/Floodbringer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Floodchaser.java b/Mage.Sets/src/mage/cards/f/Floodchaser.java index 7af9fd99111..6af53363bb2 100644 --- a/Mage.Sets/src/mage/cards/f/Floodchaser.java +++ b/Mage.Sets/src/mage/cards/f/Floodchaser.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -47,6 +46,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FloodedGrove.java b/Mage.Sets/src/mage/cards/f/FloodedGrove.java index de3ad2c5025..9d40501baf7 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedGrove.java +++ b/Mage.Sets/src/mage/cards/f/FloodedGrove.java @@ -28,7 +28,6 @@ package mage.cards.f; -import java.util.UUID; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java index 7670b7f768b..75070b8b002 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java +++ b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FloodedStrand.java b/Mage.Sets/src/mage/cards/f/FloodedStrand.java index 7e0ae8c7982..f4d8eb56c36 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedStrand.java +++ b/Mage.Sets/src/mage/cards/f/FloodedStrand.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; -import mage.constants.CardType; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java b/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java index cad65107193..dd59f8dcc05 100644 --- a/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java +++ b/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FloodwaterDam.java b/Mage.Sets/src/mage/cards/f/FloodwaterDam.java index dc1340b5777..fe0279691cc 100644 --- a/Mage.Sets/src/mage/cards/f/FloodwaterDam.java +++ b/Mage.Sets/src/mage/cards/f/FloodwaterDam.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -42,6 +41,8 @@ import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlourishingDefenses.java b/Mage.Sets/src/mage/cards/f/FlourishingDefenses.java index a902410c388..85d4435a858 100644 --- a/Mage.Sets/src/mage/cards/f/FlourishingDefenses.java +++ b/Mage.Sets/src/mage/cards/f/FlourishingDefenses.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.permanent.token.ElfToken; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FlowOfIdeas.java b/Mage.Sets/src/mage/cards/f/FlowOfIdeas.java index f1115a26c0b..f54f2b547b4 100644 --- a/Mage.Sets/src/mage/cards/f/FlowOfIdeas.java +++ b/Mage.Sets/src/mage/cards/f/FlowOfIdeas.java @@ -27,15 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java b/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java index 214e7de85b7..5219f9929bf 100644 --- a/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java +++ b/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FloweringField.java b/Mage.Sets/src/mage/cards/f/FloweringField.java index 00362a0f0de..763f22745c3 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringField.java +++ b/Mage.Sets/src/mage/cards/f/FloweringField.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,15 +38,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java b/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java index e7a7341bb2c..fa43b91d446 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java +++ b/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java b/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java index b73d1da0e2d..393042ede8a 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SkipUntapOptionalAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java b/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java index 2e58b720dc2..a7c5d1beb09 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneCharger.java b/Mage.Sets/src/mage/cards/f/FlowstoneCharger.java index 0840e3222d4..c2fe9ddc91b 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneCharger.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneCharger.java @@ -27,16 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java b/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java index b19d24b496e..d8b7d094c0b 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java b/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java index 3d67204473b..71232de5549 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneFlood.java b/Mage.Sets/src/mage/cards/f/FlowstoneFlood.java index ae25a4e22dd..c7d57f4eb0b 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneFlood.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneFlood.java @@ -27,16 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java b/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java index bce78787cd5..9e1c60841a3 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java @@ -27,15 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java b/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java index d4b14a27d64..617af468bdb 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java b/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java index be1c8cd3b77..84d3209475f 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java b/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java index 61dde0bab94..a500fc29522 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneSalamander.java b/Mage.Sets/src/mage/cards/f/FlowstoneSalamander.java index 0b9009a84a2..d31d9703b5d 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneSalamander.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneSalamander.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java b/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java index 69507915eeb..8022d446443 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.HashSet; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -52,6 +50,9 @@ import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; +import java.util.HashSet; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java b/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java index be104103ef4..8aff5dd893e 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneSlide.java b/Mage.Sets/src/mage/cards/f/FlowstoneSlide.java index 9f4655b3528..0d558f71790 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneSlide.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneSlide.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author chrisasanford diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java b/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java index 187ff53ce8a..63b40853ccc 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneWall.java b/Mage.Sets/src/mage/cards/f/FlowstoneWall.java index 762323688a5..4f6b1a1d13f 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneWall.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneWall.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java b/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java index 72f3c5ba229..d27cf83ddfd 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -37,6 +34,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/Fluctuator.java b/Mage.Sets/src/mage/cards/f/Fluctuator.java index 707257c60cc..7bf2e0482b0 100644 --- a/Mage.Sets/src/mage/cards/f/Fluctuator.java +++ b/Mage.Sets/src/mage/cards/f/Fluctuator.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -39,16 +36,15 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.ChoiceImpl; -import mage.constants.AbilityType; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java b/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java index 29fc7dae906..078c046d046 100644 --- a/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java +++ b/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlurryOfWings.java b/Mage.Sets/src/mage/cards/f/FlurryOfWings.java index 9057758d72a..5af6470cdb5 100644 --- a/Mage.Sets/src/mage/cards/f/FlurryOfWings.java +++ b/Mage.Sets/src/mage/cards/f/FlurryOfWings.java @@ -27,17 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterAttackingCreature; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/Flusterstorm.java b/Mage.Sets/src/mage/cards/f/Flusterstorm.java index bc01eff74e2..6e79c2bae10 100644 --- a/Mage.Sets/src/mage/cards/f/Flusterstorm.java +++ b/Mage.Sets/src/mage/cards/f/Flusterstorm.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.keyword.StormAbility; @@ -39,6 +38,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/Flux.java b/Mage.Sets/src/mage/cards/f/Flux.java index e213929da8b..45e851749ae 100644 --- a/Mage.Sets/src/mage/cards/f/Flux.java +++ b/Mage.Sets/src/mage/cards/f/Flux.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/Fluxcharger.java b/Mage.Sets/src/mage/cards/f/Fluxcharger.java index 31a11174aa6..6fae10adb52 100644 --- a/Mage.Sets/src/mage/cards/f/Fluxcharger.java +++ b/Mage.Sets/src/mage/cards/f/Fluxcharger.java @@ -27,20 +27,20 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continuous.SwitchPowerToughnessSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlyingCarpet.java b/Mage.Sets/src/mage/cards/f/FlyingCarpet.java index c5feb866f9c..7e6f6eb99b6 100644 --- a/Mage.Sets/src/mage/cards/f/FlyingCarpet.java +++ b/Mage.Sets/src/mage/cards/f/FlyingCarpet.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FlyingCraneTechnique.java b/Mage.Sets/src/mage/cards/f/FlyingCraneTechnique.java index 42d6dec4149..767e1081873 100644 --- a/Mage.Sets/src/mage/cards/f/FlyingCraneTechnique.java +++ b/Mage.Sets/src/mage/cards/f/FlyingCraneTechnique.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FlyingMen.java b/Mage.Sets/src/mage/cards/f/FlyingMen.java index eab6ca3291c..d235a43892c 100644 --- a/Mage.Sets/src/mage/cards/f/FlyingMen.java +++ b/Mage.Sets/src/mage/cards/f/FlyingMen.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FodderCannon.java b/Mage.Sets/src/mage/cards/f/FodderCannon.java index 000af06e296..db746a795a4 100644 --- a/Mage.Sets/src/mage/cards/f/FodderCannon.java +++ b/Mage.Sets/src/mage/cards/f/FodderCannon.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,10 +35,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FodderLaunch.java b/Mage.Sets/src/mage/cards/f/FodderLaunch.java index 7613bdef35e..6e49334736a 100644 --- a/Mage.Sets/src/mage/cards/f/FodderLaunch.java +++ b/Mage.Sets/src/mage/cards/f/FodderLaunch.java @@ -27,19 +27,19 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author BursegSardaukar */ diff --git a/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java b/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java index 1461b352696..0ad8c3260f9 100644 --- a/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java +++ b/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -53,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Fog.java b/Mage.Sets/src/mage/cards/f/Fog.java index dd2080cc6f6..b84ab9f5cd6 100644 --- a/Mage.Sets/src/mage/cards/f/Fog.java +++ b/Mage.Sets/src/mage/cards/f/Fog.java @@ -28,12 +28,13 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FogBank.java b/Mage.Sets/src/mage/cards/f/FogBank.java index a88d1bc436a..4c14238f9d7 100644 --- a/Mage.Sets/src/mage/cards/f/FogBank.java +++ b/Mage.Sets/src/mage/cards/f/FogBank.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,8 +36,12 @@ import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FogElemental.java b/Mage.Sets/src/mage/cards/f/FogElemental.java index 55b066a0d93..71fd3b4a632 100644 --- a/Mage.Sets/src/mage/cards/f/FogElemental.java +++ b/Mage.Sets/src/mage/cards/f/FogElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FogOfGnats.java b/Mage.Sets/src/mage/cards/f/FogOfGnats.java index 5a4f0648abd..27cc7cb1508 100644 --- a/Mage.Sets/src/mage/cards/f/FogOfGnats.java +++ b/Mage.Sets/src/mage/cards/f/FogOfGnats.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/Fogwalker.java b/Mage.Sets/src/mage/cards/f/Fogwalker.java index 956342727c7..9b3e7b2083a 100644 --- a/Mage.Sets/src/mage/cards/f/Fogwalker.java +++ b/Mage.Sets/src/mage/cards/f/Fogwalker.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Foil.java b/Mage.Sets/src/mage/cards/f/Foil.java index afc9f28957f..649ed598773 100644 --- a/Mage.Sets/src/mage/cards/f/Foil.java +++ b/Mage.Sets/src/mage/cards/f/Foil.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoldIntoAether.java b/Mage.Sets/src/mage/cards/f/FoldIntoAether.java index ae95ec3a706..59a75785078 100644 --- a/Mage.Sets/src/mage/cards/f/FoldIntoAether.java +++ b/Mage.Sets/src/mage/cards/f/FoldIntoAether.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -43,6 +42,8 @@ import mage.players.Player; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FolkMedicine.java b/Mage.Sets/src/mage/cards/f/FolkMedicine.java index 7044bf403ff..c58b0a065f0 100644 --- a/Mage.Sets/src/mage/cards/f/FolkMedicine.java +++ b/Mage.Sets/src/mage/cards/f/FolkMedicine.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FolkOfAnHavva.java b/Mage.Sets/src/mage/cards/f/FolkOfAnHavva.java index f76fe2744ec..0115c3d8d3b 100644 --- a/Mage.Sets/src/mage/cards/f/FolkOfAnHavva.java +++ b/Mage.Sets/src/mage/cards/f/FolkOfAnHavva.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FolkOfThePines.java b/Mage.Sets/src/mage/cards/f/FolkOfThePines.java index 7db0a5d4ad8..c0d89d079eb 100644 --- a/Mage.Sets/src/mage/cards/f/FolkOfThePines.java +++ b/Mage.Sets/src/mage/cards/f/FolkOfThePines.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author hanasu diff --git a/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java b/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java index dc214e80eb6..1632a6c868f 100644 --- a/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java +++ b/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FomoriNomad.java b/Mage.Sets/src/mage/cards/f/FomoriNomad.java index 26a98e5161c..b1e063208f1 100644 --- a/Mage.Sets/src/mage/cards/f/FomoriNomad.java +++ b/Mage.Sets/src/mage/cards/f/FomoriNomad.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FontOfFertility.java b/Mage.Sets/src/mage/cards/f/FontOfFertility.java index 02c3e193335..3ea13f52664 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFertility.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFertility.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FontOfFortunes.java b/Mage.Sets/src/mage/cards/f/FontOfFortunes.java index a0771e76082..44ab44a40a2 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFortunes.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFortunes.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FontOfIre.java b/Mage.Sets/src/mage/cards/f/FontOfIre.java index d17ab709c06..447d7af989d 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfIre.java +++ b/Mage.Sets/src/mage/cards/f/FontOfIre.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FontOfMythos.java b/Mage.Sets/src/mage/cards/f/FontOfMythos.java index 12939e56819..7d9a84ac1e7 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfMythos.java +++ b/Mage.Sets/src/mage/cards/f/FontOfMythos.java @@ -28,7 +28,6 @@ package mage.cards.f; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FontOfReturn.java b/Mage.Sets/src/mage/cards/f/FontOfReturn.java index 381ec917e36..fc98cfb6b7f 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfReturn.java +++ b/Mage.Sets/src/mage/cards/f/FontOfReturn.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FontOfVigor.java b/Mage.Sets/src/mage/cards/f/FontOfVigor.java index 0fd87ab4342..502d9649606 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfVigor.java +++ b/Mage.Sets/src/mage/cards/f/FontOfVigor.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoodChain.java b/Mage.Sets/src/mage/cards/f/FoodChain.java index 3a001b430db..54030980709 100644 --- a/Mage.Sets/src/mage/cards/f/FoodChain.java +++ b/Mage.Sets/src/mage/cards/f/FoodChain.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ConditionalMana; import mage.Mana; import mage.abilities.Ability; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FoolsDemise.java b/Mage.Sets/src/mage/cards/f/FoolsDemise.java index 066f18a9a1a..3bf92906196 100644 --- a/Mage.Sets/src/mage/cards/f/FoolsDemise.java +++ b/Mage.Sets/src/mage/cards/f/FoolsDemise.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Outcome; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoolsTome.java b/Mage.Sets/src/mage/cards/f/FoolsTome.java index 01676cc376a..ce3440771b6 100644 --- a/Mage.Sets/src/mage/cards/f/FoolsTome.java +++ b/Mage.Sets/src/mage/cards/f/FoolsTome.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.HellbentCondition; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FootSoldiers.java b/Mage.Sets/src/mage/cards/f/FootSoldiers.java index 847929e2c0c..895e51fb168 100644 --- a/Mage.Sets/src/mage/cards/f/FootSoldiers.java +++ b/Mage.Sets/src/mage/cards/f/FootSoldiers.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FootbottomFeast.java b/Mage.Sets/src/mage/cards/f/FootbottomFeast.java index 866583fccfa..6ed4b1ec309 100644 --- a/Mage.Sets/src/mage/cards/f/FootbottomFeast.java +++ b/Mage.Sets/src/mage/cards/f/FootbottomFeast.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FoothillGuide.java b/Mage.Sets/src/mage/cards/f/FoothillGuide.java index 94c499d93ce..8c18bf0396f 100644 --- a/Mage.Sets/src/mage/cards/f/FoothillGuide.java +++ b/Mage.Sets/src/mage/cards/f/FoothillGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MorphAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FootstepsOfTheGoryo.java b/Mage.Sets/src/mage/cards/f/FootstepsOfTheGoryo.java index 725bb2c793a..aa902339c43 100644 --- a/Mage.Sets/src/mage/cards/f/FootstepsOfTheGoryo.java +++ b/Mage.Sets/src/mage/cards/f/FootstepsOfTheGoryo.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/f/Foratog.java b/Mage.Sets/src/mage/cards/f/Foratog.java index 2b4db351429..993c8413629 100644 --- a/Mage.Sets/src/mage/cards/f/Foratog.java +++ b/Mage.Sets/src/mage/cards/f/Foratog.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,12 +35,15 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/Forbid.java b/Mage.Sets/src/mage/cards/f/Forbid.java index fbd0ccb3061..a1909cede8e 100644 --- a/Mage.Sets/src/mage/cards/f/Forbid.java +++ b/Mage.Sets/src/mage/cards/f/Forbid.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.keyword.BuybackAbility; @@ -39,6 +37,8 @@ import mage.filter.FilterCard; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java index 8ef5b97a977..98fce93e168 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java @@ -27,16 +27,11 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlashbackAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TimingRule; @@ -46,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenCrypt.java b/Mage.Sets/src/mage/cards/f/ForbiddenCrypt.java index 1a566bea5d2..5b2bd603526 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenCrypt.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenCrypt.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -47,6 +46,8 @@ import mage.game.permanent.PermanentToken; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java index ec9da37ea0c..4d674f27e00 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,15 +37,13 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenOrchard.java b/Mage.Sets/src/mage/cards/f/ForbiddenOrchard.java index b8ebbac06ba..1c0e8c1434a 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenOrchard.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenOrchard.java @@ -29,19 +29,20 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenTargetEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.SpiritToken; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java index 656a174f0e7..dd5aaaa706e 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/ForceAway.java b/Mage.Sets/src/mage/cards/f/ForceAway.java index d1b31da3f57..f83c3967e62 100644 --- a/Mage.Sets/src/mage/cards/f/ForceAway.java +++ b/Mage.Sets/src/mage/cards/f/ForceAway.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/ForceChoke.java b/Mage.Sets/src/mage/cards/f/ForceChoke.java index a3d155ab684..26162a6cd08 100644 --- a/Mage.Sets/src/mage/cards/f/ForceChoke.java +++ b/Mage.Sets/src/mage/cards/f/ForceChoke.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.PayLifeCost; @@ -44,6 +43,8 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceDenial.java b/Mage.Sets/src/mage/cards/f/ForceDenial.java index 4832efee6b6..ce48bac4a28 100644 --- a/Mage.Sets/src/mage/cards/f/ForceDenial.java +++ b/Mage.Sets/src/mage/cards/f/ForceDenial.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.HateCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.target.TargetSpell; import mage.watchers.common.LifeLossOtherFromCombatWatcher; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceDrain.java b/Mage.Sets/src/mage/cards/f/ForceDrain.java index 5bb111c4338..d91ccb2c1a1 100644 --- a/Mage.Sets/src/mage/cards/f/ForceDrain.java +++ b/Mage.Sets/src/mage/cards/f/ForceDrain.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.keyword.ScryEffect; @@ -40,6 +39,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceHealing.java b/Mage.Sets/src/mage/cards/f/ForceHealing.java index d259691314d..28c7b94daee 100644 --- a/Mage.Sets/src/mage/cards/f/ForceHealing.java +++ b/Mage.Sets/src/mage/cards/f/ForceHealing.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceLightning.java b/Mage.Sets/src/mage/cards/f/ForceLightning.java index 311d32e869d..740a3554281 100644 --- a/Mage.Sets/src/mage/cards/f/ForceLightning.java +++ b/Mage.Sets/src/mage/cards/f/ForceLightning.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.OneShotEffect; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceMastery.java b/Mage.Sets/src/mage/cards/f/ForceMastery.java index 0db6f835a53..9489ddc40f0 100644 --- a/Mage.Sets/src/mage/cards/f/ForceMastery.java +++ b/Mage.Sets/src/mage/cards/f/ForceMastery.java @@ -27,15 +27,10 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -44,6 +39,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceOfNature.java b/Mage.Sets/src/mage/cards/f/ForceOfNature.java index f90ede3add4..442b456a418 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfNature.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfNature.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -43,6 +42,8 @@ import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/ForceOfSavagery.java b/Mage.Sets/src/mage/cards/f/ForceOfSavagery.java index 468514759ae..bf7a324e6ce 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfSavagery.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfSavagery.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/ForceOfWill.java b/Mage.Sets/src/mage/cards/f/ForceOfWill.java index 597973654ad..e9adae8320f 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfWill.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfWill.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/ForcePull.java b/Mage.Sets/src/mage/cards/f/ForcePull.java index a6df2e9c1b4..a23afb668a3 100644 --- a/Mage.Sets/src/mage/cards/f/ForcePull.java +++ b/Mage.Sets/src/mage/cards/f/ForcePull.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.SpaceflightAbility; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForcePush.java b/Mage.Sets/src/mage/cards/f/ForcePush.java index b3dda9d935d..fc6c9012db9 100644 --- a/Mage.Sets/src/mage/cards/f/ForcePush.java +++ b/Mage.Sets/src/mage/cards/f/ForcePush.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceReflex.java b/Mage.Sets/src/mage/cards/f/ForceReflex.java index a1d0895d678..b1e75f43aaa 100644 --- a/Mage.Sets/src/mage/cards/f/ForceReflex.java +++ b/Mage.Sets/src/mage/cards/f/ForceReflex.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceScream.java b/Mage.Sets/src/mage/cards/f/ForceScream.java index 3464148146f..6bba9cbcdd2 100644 --- a/Mage.Sets/src/mage/cards/f/ForceScream.java +++ b/Mage.Sets/src/mage/cards/f/ForceScream.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.SpaceflightAbility; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceSpark.java b/Mage.Sets/src/mage/cards/f/ForceSpark.java index 41eae6e8842..0198fedb816 100644 --- a/Mage.Sets/src/mage/cards/f/ForceSpark.java +++ b/Mage.Sets/src/mage/cards/f/ForceSpark.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/ForceSpike.java b/Mage.Sets/src/mage/cards/f/ForceSpike.java index b4b3895d46f..087573b95f2 100644 --- a/Mage.Sets/src/mage/cards/f/ForceSpike.java +++ b/Mage.Sets/src/mage/cards/f/ForceSpike.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; @@ -36,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/f/ForceVoid.java b/Mage.Sets/src/mage/cards/f/ForceVoid.java index 74fd3dee3bb..50f21d88bfd 100644 --- a/Mage.Sets/src/mage/cards/f/ForceVoid.java +++ b/Mage.Sets/src/mage/cards/f/ForceVoid.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/ForcedAdaptation.java b/Mage.Sets/src/mage/cards/f/ForcedAdaptation.java index e5703192ca8..281aea9becf 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedAdaptation.java +++ b/Mage.Sets/src/mage/cards/f/ForcedAdaptation.java @@ -27,11 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -39,9 +34,15 @@ import mage.abilities.effects.common.counter.AddPlusOneCountersAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/ForcedFruition.java b/Mage.Sets/src/mage/cards/f/ForcedFruition.java index 5c6a8b1aa45..0e7ca4589cf 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedFruition.java +++ b/Mage.Sets/src/mage/cards/f/ForcedFruition.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; @@ -38,6 +36,8 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.FilterSpell; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/f/ForcedMarch.java b/Mage.Sets/src/mage/cards/f/ForcedMarch.java index 72fa35ef412..14b5054028e 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedMarch.java +++ b/Mage.Sets/src/mage/cards/f/ForcedMarch.java @@ -5,22 +5,22 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; -import mage.constants.CardType; - -/** - * - * @author nick.myers - */ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + +/** + * @author nick.myers + */ + public class ForcedMarch extends CardImpl { diff --git a/Mage.Sets/src/mage/cards/f/ForcedRetreat.java b/Mage.Sets/src/mage/cards/f/ForcedRetreat.java index 9492f03d953..72d56d67dc0 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedRetreat.java +++ b/Mage.Sets/src/mage/cards/f/ForcedRetreat.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/ForcedWorship.java b/Mage.Sets/src/mage/cards/f/ForcedWorship.java index 66ca8293a02..59f6e631c8b 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedWorship.java +++ b/Mage.Sets/src/mage/cards/f/ForcedWorship.java @@ -28,9 +28,6 @@ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,9 +38,15 @@ import mage.abilities.effects.common.combat.CantAttackAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Forcefield.java b/Mage.Sets/src/mage/cards/f/Forcefield.java index b35074e689c..f87f80f357e 100644 --- a/Mage.Sets/src/mage/cards/f/Forcefield.java +++ b/Mage.Sets/src/mage/cards/f/Forcefield.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -52,6 +51,8 @@ import mage.target.Target; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/ForebodingRuins.java b/Mage.Sets/src/mage/cards/f/ForebodingRuins.java index 9d98bb6a2b1..6108d48ece5 100644 --- a/Mage.Sets/src/mage/cards/f/ForebodingRuins.java +++ b/Mage.Sets/src/mage/cards/f/ForebodingRuins.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java index 8a987107cdc..8fd4207d00b 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Foresee.java b/Mage.Sets/src/mage/cards/f/Foresee.java index 27c6595f1b2..f0957796a17 100644 --- a/Mage.Sets/src/mage/cards/f/Foresee.java +++ b/Mage.Sets/src/mage/cards/f/Foresee.java @@ -28,12 +28,13 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/ForestBear.java b/Mage.Sets/src/mage/cards/f/ForestBear.java index d612381208d..5dc8620dd07 100644 --- a/Mage.Sets/src/mage/cards/f/ForestBear.java +++ b/Mage.Sets/src/mage/cards/f/ForestBear.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Forfend.java b/Mage.Sets/src/mage/cards/f/Forfend.java index 91fcfdb0f62..934d49eedbf 100644 --- a/Mage.Sets/src/mage/cards/f/Forfend.java +++ b/Mage.Sets/src/mage/cards/f/Forfend.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.PreventAllDamageToAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/ForgeArmor.java b/Mage.Sets/src/mage/cards/f/ForgeArmor.java index bfca5b07872..752ecba43b5 100644 --- a/Mage.Sets/src/mage/cards/f/ForgeArmor.java +++ b/Mage.Sets/src/mage/cards/f/ForgeArmor.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.dynamicvalue.common.SacrificeCostConvertedMana; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/ForgeDevil.java b/Mage.Sets/src/mage/cards/f/ForgeDevil.java index 5f1d141736f..bc05eec5a31 100644 --- a/Mage.Sets/src/mage/cards/f/ForgeDevil.java +++ b/Mage.Sets/src/mage/cards/f/ForgeDevil.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/f/ForgebornOreads.java b/Mage.Sets/src/mage/cards/f/ForgebornOreads.java index e17213678e6..2a1fa44b9df 100644 --- a/Mage.Sets/src/mage/cards/f/ForgebornOreads.java +++ b/Mage.Sets/src/mage/cards/f/ForgebornOreads.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.abilityword.ConstellationAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/ForgestokerDragon.java b/Mage.Sets/src/mage/cards/f/ForgestokerDragon.java index 67dc64d6c21..d661e3d0546 100644 --- a/Mage.Sets/src/mage/cards/f/ForgestokerDragon.java +++ b/Mage.Sets/src/mage/cards/f/ForgestokerDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Forget.java b/Mage.Sets/src/mage/cards/f/Forget.java index 12a739a4b92..2c5d6fd119b 100644 --- a/Mage.Sets/src/mage/cards/f/Forget.java +++ b/Mage.Sets/src/mage/cards/f/Forget.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/ForgottenAncient.java b/Mage.Sets/src/mage/cards/f/ForgottenAncient.java index 7513d62d574..0fe92d351b8 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenAncient.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenAncient.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.ArrayList; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -51,6 +49,9 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author Blinke diff --git a/Mage.Sets/src/mage/cards/f/ForgottenCave.java b/Mage.Sets/src/mage/cards/f/ForgottenCave.java index 28f39e9c513..6376f03981f 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenCave.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenCave.java @@ -27,14 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/ForgottenCreation.java b/Mage.Sets/src/mage/cards/f/ForgottenCreation.java index 5ebebee7ba9..c82233fbcad 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenCreation.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenCreation.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/ForgottenLore.java b/Mage.Sets/src/mage/cards/f/ForgottenLore.java index ef502bcd430..7276b39bc37 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenLore.java @@ -27,16 +27,11 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -48,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetOpponent; + +import java.util.UUID; /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java b/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java index 2bc1e85efab..36a20c70c90 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java b/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java index a6cdb72f20d..76ffa1d81b0 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/Fork.java b/Mage.Sets/src/mage/cards/f/Fork.java index 84bcec8ee78..e2710b74eef 100644 --- a/Mage.Sets/src/mage/cards/f/Fork.java +++ b/Mage.Sets/src/mage/cards/f/Fork.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/ForkInTheRoad.java b/Mage.Sets/src/mage/cards/f/ForkInTheRoad.java index 066266ec64c..b6ac1d29e2f 100644 --- a/Mage.Sets/src/mage/cards/f/ForkInTheRoad.java +++ b/Mage.Sets/src/mage/cards/f/ForkInTheRoad.java @@ -27,15 +27,10 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -46,6 +41,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/ForkedBolt.java b/Mage.Sets/src/mage/cards/f/ForkedBolt.java index dceb13efc37..701bbac1bbc 100644 --- a/Mage.Sets/src/mage/cards/f/ForkedBolt.java +++ b/Mage.Sets/src/mage/cards/f/ForkedBolt.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayerAmount; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/ForkedBranchGarami.java b/Mage.Sets/src/mage/cards/f/ForkedBranchGarami.java index 7bc9e40a1cc..1564bf25580 100644 --- a/Mage.Sets/src/mage/cards/f/ForkedBranchGarami.java +++ b/Mage.Sets/src/mage/cards/f/ForkedBranchGarami.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java b/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java index 2ef119130ab..4add9e38f8c 100644 --- a/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java +++ b/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java index 859e047b7b6..2df4c8ad334 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/FormlessNurturing.java b/Mage.Sets/src/mage/cards/f/FormlessNurturing.java index 63f656ec2de..f7b6f0bd415 100644 --- a/Mage.Sets/src/mage/cards/f/FormlessNurturing.java +++ b/Mage.Sets/src/mage/cards/f/FormlessNurturing.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/ForsakenCity.java b/Mage.Sets/src/mage/cards/f/ForsakenCity.java index 67711a1dd5c..23d115cb25a 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakenCity.java +++ b/Mage.Sets/src/mage/cards/f/ForsakenCity.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.ExileFromHandCost; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author Luna Skyrise diff --git a/Mage.Sets/src/mage/cards/f/ForsakenDrifters.java b/Mage.Sets/src/mage/cards/f/ForsakenDrifters.java index e9cd7125763..4d1cea5f888 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakenDrifters.java +++ b/Mage.Sets/src/mage/cards/f/ForsakenDrifters.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/ForsakenSanctuary.java b/Mage.Sets/src/mage/cards/f/ForsakenSanctuary.java index 4637a7ac1c7..ac135e82bd8 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakenSanctuary.java +++ b/Mage.Sets/src/mage/cards/f/ForsakenSanctuary.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.WhiteManaAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/ForsakenWastes.java b/Mage.Sets/src/mage/cards/f/ForsakenWastes.java index 68305aef982..d36af61591e 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakenWastes.java +++ b/Mage.Sets/src/mage/cards/f/ForsakenWastes.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.continuous.CantGainLifeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; @@ -45,6 +45,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes @@ -53,7 +55,7 @@ public class ForsakenWastes extends CardImpl { public ForsakenWastes(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // Players can't gain life. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); diff --git a/Mage.Sets/src/mage/cards/f/FortifiedRampart.java b/Mage.Sets/src/mage/cards/f/FortifiedRampart.java index 32f5ec4ae45..9ac30ab9298 100644 --- a/Mage.Sets/src/mage/cards/f/FortifiedRampart.java +++ b/Mage.Sets/src/mage/cards/f/FortifiedRampart.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FortifiedVillage.java b/Mage.Sets/src/mage/cards/f/FortifiedVillage.java index 493498fc3b8..cebad51600b 100644 --- a/Mage.Sets/src/mage/cards/f/FortifiedVillage.java +++ b/Mage.Sets/src/mage/cards/f/FortifiedVillage.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/Fortify.java b/Mage.Sets/src/mage/cards/f/Fortify.java index 74ef6d2df6b..1ebe606573a 100644 --- a/Mage.Sets/src/mage/cards/f/Fortify.java +++ b/Mage.Sets/src/mage/cards/f/Fortify.java @@ -27,15 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Fortitude.java b/Mage.Sets/src/mage/cards/f/Fortitude.java index 844e8b2ef41..7c8f9944d30 100644 --- a/Mage.Sets/src/mage/cards/f/Fortitude.java +++ b/Mage.Sets/src/mage/cards/f/Fortitude.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author hanasu diff --git a/Mage.Sets/src/mage/cards/f/FortressCrab.java b/Mage.Sets/src/mage/cards/f/FortressCrab.java index 57eea924f10..faaa72522bd 100644 --- a/Mage.Sets/src/mage/cards/f/FortressCrab.java +++ b/Mage.Sets/src/mage/cards/f/FortressCrab.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FortressCyclops.java b/Mage.Sets/src/mage/cards/f/FortressCyclops.java index 842effcebd0..f5e0c2f14ee 100644 --- a/Mage.Sets/src/mage/cards/f/FortressCyclops.java +++ b/Mage.Sets/src/mage/cards/f/FortressCyclops.java @@ -27,15 +27,16 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FortuitousFind.java b/Mage.Sets/src/mage/cards/f/FortuitousFind.java index 37d9ced7371..ea5fb1a4185 100644 --- a/Mage.Sets/src/mage/cards/f/FortuitousFind.java +++ b/Mage.Sets/src/mage/cards/f/FortuitousFind.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.common.FilterArtifactCard; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FortuneThief.java b/Mage.Sets/src/mage/cards/f/FortuneThief.java index db975be43d0..df0d845de71 100644 --- a/Mage.Sets/src/mage/cards/f/FortuneThief.java +++ b/Mage.Sets/src/mage/cards/f/FortuneThief.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FortunesFavor.java b/Mage.Sets/src/mage/cards/f/FortunesFavor.java index 9e9b780a1a0..0f4f22b15ab 100644 --- a/Mage.Sets/src/mage/cards/f/FortunesFavor.java +++ b/Mage.Sets/src/mage/cards/f/FortunesFavor.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FossilFind.java b/Mage.Sets/src/mage/cards/f/FossilFind.java index eb2579fa02d..51421e6d748 100644 --- a/Mage.Sets/src/mage/cards/f/FossilFind.java +++ b/Mage.Sets/src/mage/cards/f/FossilFind.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/Foster.java b/Mage.Sets/src/mage/cards/f/Foster.java index 7f38e3d6fe6..48a7e2ab8c0 100644 --- a/Mage.Sets/src/mage/cards/f/Foster.java +++ b/Mage.Sets/src/mage/cards/f/Foster.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoulEmissary.java b/Mage.Sets/src/mage/cards/f/FoulEmissary.java index f98b53d26c8..2e71addce19 100644 --- a/Mage.Sets/src/mage/cards/f/FoulEmissary.java +++ b/Mage.Sets/src/mage/cards/f/FoulEmissary.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SacrificeSourceTriggeredAbility; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.token.EldraziHorrorToken; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoulFamiliar.java b/Mage.Sets/src/mage/cards/f/FoulFamiliar.java index 2deb64e023b..268d9117dcb 100644 --- a/Mage.Sets/src/mage/cards/f/FoulFamiliar.java +++ b/Mage.Sets/src/mage/cards/f/FoulFamiliar.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FoulImp.java b/Mage.Sets/src/mage/cards/f/FoulImp.java index 0fee8828222..5fa371edb99 100644 --- a/Mage.Sets/src/mage/cards/f/FoulImp.java +++ b/Mage.Sets/src/mage/cards/f/FoulImp.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author daagar diff --git a/Mage.Sets/src/mage/cards/f/FoulOrchard.java b/Mage.Sets/src/mage/cards/f/FoulOrchard.java index 5d56292c593..9d8a6049c0c 100644 --- a/Mage.Sets/src/mage/cards/f/FoulOrchard.java +++ b/Mage.Sets/src/mage/cards/f/FoulOrchard.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FoulPresence.java b/Mage.Sets/src/mage/cards/f/FoulPresence.java index 84e02f06d96..6133b8026f3 100644 --- a/Mage.Sets/src/mage/cards/f/FoulPresence.java +++ b/Mage.Sets/src/mage/cards/f/FoulPresence.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,14 +39,12 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FoulRenewal.java b/Mage.Sets/src/mage/cards/f/FoulRenewal.java index e5080f88c23..2289f28f602 100644 --- a/Mage.Sets/src/mage/cards/f/FoulRenewal.java +++ b/Mage.Sets/src/mage/cards/f/FoulRenewal.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoulSpirit.java b/Mage.Sets/src/mage/cards/f/FoulSpirit.java index bc5158b1508..cf8a297cb27 100644 --- a/Mage.Sets/src/mage/cards/f/FoulSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FoulSpirit.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.SacrificeControllerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java b/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java index d55a933fede..09938de420c 100644 --- a/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java +++ b/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.OneShotEffect; @@ -48,6 +46,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetCardInHand; import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoulTongueShriek.java b/Mage.Sets/src/mage/cards/f/FoulTongueShriek.java index 3c90acb32f4..82dc864a5d8 100644 --- a/Mage.Sets/src/mage/cards/f/FoulTongueShriek.java +++ b/Mage.Sets/src/mage/cards/f/FoulTongueShriek.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.AttackingFilterCreatureCount; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoundryAssembler.java b/Mage.Sets/src/mage/cards/f/FoundryAssembler.java index 4e38c4dd810..3c3dba3d3d7 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryAssembler.java +++ b/Mage.Sets/src/mage/cards/f/FoundryAssembler.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ImproviseAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FoundryChampion.java b/Mage.Sets/src/mage/cards/f/FoundryChampion.java index 4653106b837..8bce6590e0b 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryChampion.java +++ b/Mage.Sets/src/mage/cards/f/FoundryChampion.java @@ -28,9 +28,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,11 +38,14 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FoundryHornet.java b/Mage.Sets/src/mage/cards/f/FoundryHornet.java index 537f32fdee7..9a9ae008967 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryHornet.java +++ b/Mage.Sets/src/mage/cards/f/FoundryHornet.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoundryInspector.java b/Mage.Sets/src/mage/cards/f/FoundryInspector.java index 65b8dc549f8..7b0d040bf9e 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryInspector.java +++ b/Mage.Sets/src/mage/cards/f/FoundryInspector.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; @@ -38,6 +37,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java index 6a97ff0abeb..b56dda39f23 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java +++ b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.ThopterColorlessToken; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FoundryScreecher.java b/Mage.Sets/src/mage/cards/f/FoundryScreecher.java index 92815bf8cf2..8f20e7895c4 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryScreecher.java +++ b/Mage.Sets/src/mage/cards/f/FoundryScreecher.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java b/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java index f3e772464a4..2c3940b2afe 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java +++ b/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java @@ -27,23 +27,24 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FountainOfCho.java b/Mage.Sets/src/mage/cards/f/FountainOfCho.java index abbbfb1cc21..c5340dfb1ab 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfCho.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfCho.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/f/FountainOfYouth.java b/Mage.Sets/src/mage/cards/f/FountainOfYouth.java index 7c0bae98659..710d8e8fd2f 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfYouth.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfYouth.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,8 +34,11 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FountainWatch.java b/Mage.Sets/src/mage/cards/f/FountainWatch.java index 3e83f7f1af2..e0e59ee4b22 100644 --- a/Mage.Sets/src/mage/cards/f/FountainWatch.java +++ b/Mage.Sets/src/mage/cards/f/FountainWatch.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/f/FourthBridgeProwler.java b/Mage.Sets/src/mage/cards/f/FourthBridgeProwler.java index 057a809c44d..8df13412d8f 100644 --- a/Mage.Sets/src/mage/cards/f/FourthBridgeProwler.java +++ b/Mage.Sets/src/mage/cards/f/FourthBridgeProwler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FoxfireOak.java b/Mage.Sets/src/mage/cards/f/FoxfireOak.java index 78022a4c1ca..d5715c0f463 100644 --- a/Mage.Sets/src/mage/cards/f/FoxfireOak.java +++ b/Mage.Sets/src/mage/cards/f/FoxfireOak.java @@ -27,16 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FracturingGust.java b/Mage.Sets/src/mage/cards/f/FracturingGust.java index 184ee22f7c1..98d277ac066 100644 --- a/Mage.Sets/src/mage/cards/f/FracturingGust.java +++ b/Mage.Sets/src/mage/cards/f/FracturingGust.java @@ -27,13 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Fragmentize.java b/Mage.Sets/src/mage/cards/f/Fragmentize.java index af4506ec406..001510c7e96 100644 --- a/Mage.Sets/src/mage/cards/f/Fragmentize.java +++ b/Mage.Sets/src/mage/cards/f/Fragmentize.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FranticPurification.java b/Mage.Sets/src/mage/cards/f/FranticPurification.java index 9c540994aeb..8b6c76eb5d5 100644 --- a/Mage.Sets/src/mage/cards/f/FranticPurification.java +++ b/Mage.Sets/src/mage/cards/f/FranticPurification.java @@ -27,12 +27,12 @@ */ package mage.cards.f; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetEnchantmentPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FranticSalvage.java b/Mage.Sets/src/mage/cards/f/FranticSalvage.java index 0e760d8fecb..4e4e0916869 100644 --- a/Mage.Sets/src/mage/cards/f/FranticSalvage.java +++ b/Mage.Sets/src/mage/cards/f/FranticSalvage.java @@ -27,15 +27,15 @@ */ package mage.cards.f; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterArtifactCard; +import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; -import mage.target.common.TargetCardInYourGraveyard; /** * diff --git a/Mage.Sets/src/mage/cards/f/FranticSearch.java b/Mage.Sets/src/mage/cards/f/FranticSearch.java index b1712c22ddd..9340ba938d3 100644 --- a/Mage.Sets/src/mage/cards/f/FranticSearch.java +++ b/Mage.Sets/src/mage/cards/f/FranticSearch.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DrawDiscardControllerEffect; -import mage.constants.CardType; import mage.abilities.effects.common.UntapLandsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/Frazzle.java b/Mage.Sets/src/mage/cards/f/Frazzle.java index ddb8acb84fd..cf5fb1b4bd7 100644 --- a/Mage.Sets/src/mage/cards/f/Frazzle.java +++ b/Mage.Sets/src/mage/cards/f/Frazzle.java @@ -27,17 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java index 0a39fd110ed..ce7a5ee92ca 100644 --- a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java +++ b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.AttachEffect; @@ -39,10 +35,14 @@ import mage.abilities.effects.common.UntapEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX diff --git a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java index 9a6e1629437..7757fc58b9e 100644 --- a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java +++ b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,9 +38,14 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FreewindFalcon.java b/Mage.Sets/src/mage/cards/f/FreewindFalcon.java index 92017c98a7c..a55481a93be 100644 --- a/Mage.Sets/src/mage/cards/f/FreewindFalcon.java +++ b/Mage.Sets/src/mage/cards/f/FreewindFalcon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/f/FreneticEfreet.java b/Mage.Sets/src/mage/cards/f/FreneticEfreet.java index 37b2bd3252e..a68a812e94d 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticEfreet.java +++ b/Mage.Sets/src/mage/cards/f/FreneticEfreet.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FreneticOgre.java b/Mage.Sets/src/mage/cards/f/FreneticOgre.java index e73840be64e..0a84f51ba8e 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticOgre.java +++ b/Mage.Sets/src/mage/cards/f/FreneticOgre.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/f/FreneticSliver.java b/Mage.Sets/src/mage/cards/f/FreneticSliver.java index af8cac90b61..21f2540f257 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticSliver.java +++ b/Mage.Sets/src/mage/cards/f/FreneticSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/f/FrenziedFugue.java b/Mage.Sets/src/mage/cards/f/FrenziedFugue.java index 27ab625d1fd..782176b789f 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedFugue.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedFugue.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -51,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author LevelX2 */ diff --git a/Mage.Sets/src/mage/cards/f/FrenziedGoblin.java b/Mage.Sets/src/mage/cards/f/FrenziedGoblin.java index fbaae281280..2a22ad96fe4 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedGoblin.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedGoblin.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FrenziedTilling.java b/Mage.Sets/src/mage/cards/f/FrenziedTilling.java index 18f96367f96..25e253caa5a 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedTilling.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedTilling.java @@ -27,16 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FrenzySliver.java b/Mage.Sets/src/mage/cards/f/FrenzySliver.java index 515b6213c1a..623a9252904 100644 --- a/Mage.Sets/src/mage/cards/f/FrenzySliver.java +++ b/Mage.Sets/src/mage/cards/f/FrenzySliver.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FreshMeat.java b/Mage.Sets/src/mage/cards/f/FreshMeat.java index bd144d9195d..87d68b34680 100644 --- a/Mage.Sets/src/mage/cards/f/FreshMeat.java +++ b/Mage.Sets/src/mage/cards/f/FreshMeat.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.permanent.token.BeastToken; import mage.watchers.common.CreaturesDiedWatcher; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FreshVolunteers.java b/Mage.Sets/src/mage/cards/f/FreshVolunteers.java index 4c97a4b5e95..880eadf4586 100644 --- a/Mage.Sets/src/mage/cards/f/FreshVolunteers.java +++ b/Mage.Sets/src/mage/cards/f/FreshVolunteers.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FretworkColony.java b/Mage.Sets/src/mage/cards/f/FretworkColony.java index cc920ef4272..e4b06e8e22e 100644 --- a/Mage.Sets/src/mage/cards/f/FretworkColony.java +++ b/Mage.Sets/src/mage/cards/f/FretworkColony.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java b/Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java index fda2a75bd7f..aa9d8bc273c 100644 --- a/Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java +++ b/Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.LoyaltyAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FriendlyFire.java b/Mage.Sets/src/mage/cards/f/FriendlyFire.java index f72eb127a9e..e6e954ad0cf 100644 --- a/Mage.Sets/src/mage/cards/f/FriendlyFire.java +++ b/Mage.Sets/src/mage/cards/f/FriendlyFire.java @@ -27,15 +27,10 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; @@ -43,6 +38,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/Frightcrawler.java b/Mage.Sets/src/mage/cards/f/Frightcrawler.java index bbaeb3e3aad..27be4cbfe76 100644 --- a/Mage.Sets/src/mage/cards/f/Frightcrawler.java +++ b/Mage.Sets/src/mage/cards/f/Frightcrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/f/FrightfulDelusion.java b/Mage.Sets/src/mage/cards/f/FrightfulDelusion.java index 7f7a7a23883..79691d54600 100644 --- a/Mage.Sets/src/mage/cards/f/FrightfulDelusion.java +++ b/Mage.Sets/src/mage/cards/f/FrightfulDelusion.java @@ -27,20 +27,21 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.game.stack.StackObject; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Rafbill diff --git a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java index 1be6bbfc540..cb94ff13b46 100644 --- a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java +++ b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FrilledOculus.java b/Mage.Sets/src/mage/cards/f/FrilledOculus.java index da2d4ae9a66..b079df86241 100644 --- a/Mage.Sets/src/mage/cards/f/FrilledOculus.java +++ b/Mage.Sets/src/mage/cards/f/FrilledOculus.java @@ -27,18 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FrogTongue.java b/Mage.Sets/src/mage/cards/f/FrogTongue.java index 369944b2bbf..8f8d468d00d 100644 --- a/Mage.Sets/src/mage/cards/f/FrogTongue.java +++ b/Mage.Sets/src/mage/cards/f/FrogTongue.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,9 +37,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/f/Frogmite.java b/Mage.Sets/src/mage/cards/f/Frogmite.java index 530c69b60de..1e2557cf4f9 100644 --- a/Mage.Sets/src/mage/cards/f/Frogmite.java +++ b/Mage.Sets/src/mage/cards/f/Frogmite.java @@ -27,12 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.AffinityForArtifactsAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java index 453568518d8..c36ef5a166c 100644 --- a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java +++ b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java @@ -27,19 +27,20 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FromBeyond.java b/Mage.Sets/src/mage/cards/f/FromBeyond.java index 3aa53e75395..f48d824e41b 100644 --- a/Mage.Sets/src/mage/cards/f/FromBeyond.java +++ b/Mage.Sets/src/mage/cards/f/FromBeyond.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.EldraziScionToken; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FromTheAshes.java b/Mage.Sets/src/mage/cards/f/FromTheAshes.java index 397d6c1fa27..ca52f4d66e6 100644 --- a/Mage.Sets/src/mage/cards/f/FromTheAshes.java +++ b/Mage.Sets/src/mage/cards/f/FromTheAshes.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -45,6 +42,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java b/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java index 52b190caa23..f209d1900ac 100644 --- a/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java +++ b/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.game.Game; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/f/FrontierBivouac.java b/Mage.Sets/src/mage/cards/f/FrontierBivouac.java index 6aa73c74d8d..eadf2792bb2 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierBivouac.java +++ b/Mage.Sets/src/mage/cards/f/FrontierBivouac.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FrontierGuide.java b/Mage.Sets/src/mage/cards/f/FrontierGuide.java index 7a80bb99dd1..3110b786ad5 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierGuide.java +++ b/Mage.Sets/src/mage/cards/f/FrontierGuide.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,9 +34,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FrontierMastodon.java b/Mage.Sets/src/mage/cards/f/FrontierMastodon.java index be476d413ec..606c50084b6 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierMastodon.java +++ b/Mage.Sets/src/mage/cards/f/FrontierMastodon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.FerociousCondition; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FrontierSiege.java b/Mage.Sets/src/mage/cards/f/FrontierSiege.java index d84289ae34a..5d937f57b95 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierSiege.java +++ b/Mage.Sets/src/mage/cards/f/FrontierSiege.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -41,11 +40,7 @@ import mage.abilities.effects.common.ChooseModeEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -54,6 +49,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FrontlineMedic.java b/Mage.Sets/src/mage/cards/f/FrontlineMedic.java index 8188d7a1b94..cc4f2bcde8d 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineMedic.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineMedic.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +39,7 @@ import mage.abilities.keyword.BattalionAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterSpell; @@ -49,6 +47,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.VariableManaCostPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FrontlineRebel.java b/Mage.Sets/src/mage/cards/f/FrontlineRebel.java index 6ac05f3a295..5b2f33ab4de 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineRebel.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineRebel.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FrontlineSage.java b/Mage.Sets/src/mage/cards/f/FrontlineSage.java index 98a548efacf..4cc2a635209 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineSage.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineSage.java @@ -28,9 +28,6 @@ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,8 +37,11 @@ import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FrostBreath.java b/Mage.Sets/src/mage/cards/f/FrostBreath.java index 67ec4dd4deb..7b2a910eaa4 100644 --- a/Mage.Sets/src/mage/cards/f/FrostBreath.java +++ b/Mage.Sets/src/mage/cards/f/FrostBreath.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/f/FrostGiant.java b/Mage.Sets/src/mage/cards/f/FrostGiant.java index 474d0804245..b5bbb6f27b9 100644 --- a/Mage.Sets/src/mage/cards/f/FrostGiant.java +++ b/Mage.Sets/src/mage/cards/f/FrostGiant.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.RampageAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FrostLynx.java b/Mage.Sets/src/mage/cards/f/FrostLynx.java index 999165d0688..3a0f4fe96a3 100644 --- a/Mage.Sets/src/mage/cards/f/FrostLynx.java +++ b/Mage.Sets/src/mage/cards/f/FrostLynx.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FrostMarsh.java b/Mage.Sets/src/mage/cards/f/FrostMarsh.java index 80f21c9e729..5d70bafb62a 100644 --- a/Mage.Sets/src/mage/cards/f/FrostMarsh.java +++ b/Mage.Sets/src/mage/cards/f/FrostMarsh.java @@ -27,14 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +45,7 @@ public class FrostMarsh extends CardImpl { public FrostMarsh(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); // Frost Marsh enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/f/FrostOgre.java b/Mage.Sets/src/mage/cards/f/FrostOgre.java index ab8f8eaa0e8..f1955e27b2b 100644 --- a/Mage.Sets/src/mage/cards/f/FrostOgre.java +++ b/Mage.Sets/src/mage/cards/f/FrostOgre.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FrostRaptor.java b/Mage.Sets/src/mage/cards/f/FrostRaptor.java index 5bec72c6fec..3239cff4757 100644 --- a/Mage.Sets/src/mage/cards/f/FrostRaptor.java +++ b/Mage.Sets/src/mage/cards/f/FrostRaptor.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,8 +37,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox @@ -48,7 +50,7 @@ public class FrostRaptor extends CardImpl { public FrostRaptor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Bird"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/f/FrostTitan.java b/Mage.Sets/src/mage/cards/f/FrostTitan.java index 86ac14b6c49..34a2eaecf6c 100644 --- a/Mage.Sets/src/mage/cards/f/FrostTitan.java +++ b/Mage.Sets/src/mage/cards/f/FrostTitan.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -40,12 +37,16 @@ import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEf import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.TargetPermanent; import mage.target.TargetStackObject; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FrostWalker.java b/Mage.Sets/src/mage/cards/f/FrostWalker.java index c26bb144dd0..1b6631b7a5f 100644 --- a/Mage.Sets/src/mage/cards/f/FrostWalker.java +++ b/Mage.Sets/src/mage/cards/f/FrostWalker.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FrostburnWeird.java b/Mage.Sets/src/mage/cards/f/FrostburnWeird.java index 31d29ce6c6d..abd300333a9 100644 --- a/Mage.Sets/src/mage/cards/f/FrostburnWeird.java +++ b/Mage.Sets/src/mage/cards/f/FrostburnWeird.java @@ -27,18 +27,18 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Frostling.java b/Mage.Sets/src/mage/cards/f/Frostling.java index ebd2b8a61f6..84d716db663 100644 --- a/Mage.Sets/src/mage/cards/f/Frostling.java +++ b/Mage.Sets/src/mage/cards/f/Frostling.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +34,12 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Frostwielder.java b/Mage.Sets/src/mage/cards/f/Frostwielder.java index 4ac3d613b86..4c4302b9b39 100644 --- a/Mage.Sets/src/mage/cards/f/Frostwielder.java +++ b/Mage.Sets/src/mage/cards/f/Frostwielder.java @@ -28,7 +28,6 @@ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * @author LevelX */ diff --git a/Mage.Sets/src/mage/cards/f/FrostwindInvoker.java b/Mage.Sets/src/mage/cards/f/FrostwindInvoker.java index d48baf8915a..02319acc977 100644 --- a/Mage.Sets/src/mage/cards/f/FrostwindInvoker.java +++ b/Mage.Sets/src/mage/cards/f/FrostwindInvoker.java @@ -27,10 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +34,11 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FrozenAether.java b/Mage.Sets/src/mage/cards/f/FrozenAether.java index 9b99c1e778f..d3827eda56a 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenAether.java +++ b/Mage.Sets/src/mage/cards/f/FrozenAether.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FrozenShade.java b/Mage.Sets/src/mage/cards/f/FrozenShade.java index 589c56bc4bd..cffdacb077c 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenShade.java +++ b/Mage.Sets/src/mage/cards/f/FrozenShade.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/f/FrozenSolid.java b/Mage.Sets/src/mage/cards/f/FrozenSolid.java index 0b488e17ac9..32827e7e95d 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenSolid.java +++ b/Mage.Sets/src/mage/cards/f/FrozenSolid.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DealtDamageAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FruitOfTheFirstTree.java b/Mage.Sets/src/mage/cards/f/FruitOfTheFirstTree.java index 07f1795b5ea..82187ab2be2 100644 --- a/Mage.Sets/src/mage/cards/f/FruitOfTheFirstTree.java +++ b/Mage.Sets/src/mage/cards/f/FruitOfTheFirstTree.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -44,6 +43,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/Fruition.java b/Mage.Sets/src/mage/cards/f/Fruition.java index fe660790f1b..1b63833e838 100644 --- a/Mage.Sets/src/mage/cards/f/Fruition.java +++ b/Mage.Sets/src/mage/cards/f/Fruition.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FuelForTheCause.java b/Mage.Sets/src/mage/cards/f/FuelForTheCause.java index 5ff3827354b..b2bd9b20178 100644 --- a/Mage.Sets/src/mage/cards/f/FuelForTheCause.java +++ b/Mage.Sets/src/mage/cards/f/FuelForTheCause.java @@ -28,14 +28,15 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FugitiveDruid.java b/Mage.Sets/src/mage/cards/f/FugitiveDruid.java index 76c9bcc50b6..a704626722e 100644 --- a/Mage.Sets/src/mage/cards/f/FugitiveDruid.java +++ b/Mage.Sets/src/mage/cards/f/FugitiveDruid.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FugitiveWizard.java b/Mage.Sets/src/mage/cards/f/FugitiveWizard.java index ccb1b724752..051883b95f2 100644 --- a/Mage.Sets/src/mage/cards/f/FugitiveWizard.java +++ b/Mage.Sets/src/mage/cards/f/FugitiveWizard.java @@ -27,11 +27,12 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/Fugue.java b/Mage.Sets/src/mage/cards/f/Fugue.java index 50d17d44106..cf5f2bb42c4 100644 --- a/Mage.Sets/src/mage/cards/f/Fugue.java +++ b/Mage.Sets/src/mage/cards/f/Fugue.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FulfillContract.java b/Mage.Sets/src/mage/cards/f/FulfillContract.java index 3c5fb1f093e..fbbf3ad6dc4 100644 --- a/Mage.Sets/src/mage/cards/f/FulfillContract.java +++ b/Mage.Sets/src/mage/cards/f/FulfillContract.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java index a6234988d99..6a85d2c0185 100644 --- a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java +++ b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java @@ -27,11 +27,11 @@ */ package mage.cards.f; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.SacrificeSourceCost; +import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffect; import mage.abilities.effects.common.RegenerateTargetEffect; @@ -40,6 +40,10 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +52,6 @@ import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; import java.util.UUID; -import mage.abilities.effects.Effect; /** * @author nantuko diff --git a/Mage.Sets/src/mage/cards/f/FulminatorMage.java b/Mage.Sets/src/mage/cards/f/FulminatorMage.java index eceb3ce1557..953c23c263b 100644 --- a/Mage.Sets/src/mage/cards/f/FulminatorMage.java +++ b/Mage.Sets/src/mage/cards/f/FulminatorMage.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,8 +34,12 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/Fumarole.java b/Mage.Sets/src/mage/cards/f/Fumarole.java index 69299374ee3..86cdc13cc1b 100644 --- a/Mage.Sets/src/mage/cards/f/Fumarole.java +++ b/Mage.Sets/src/mage/cards/f/Fumarole.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FumeSpitter.java b/Mage.Sets/src/mage/cards/f/FumeSpitter.java index 229be1561f3..a8722e3d2b0 100644 --- a/Mage.Sets/src/mage/cards/f/FumeSpitter.java +++ b/Mage.Sets/src/mage/cards/f/FumeSpitter.java @@ -28,9 +28,6 @@ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,13 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/Fumigate.java b/Mage.Sets/src/mage/cards/f/Fumigate.java index 92e6d2dbbdd..668ab91c2e5 100644 --- a/Mage.Sets/src/mage/cards/f/Fumigate.java +++ b/Mage.Sets/src/mage/cards/f/Fumigate.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java b/Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java index a4a07b9d40b..48877c51532 100644 --- a/Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java +++ b/Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.AttackingCreatureCount; @@ -36,12 +35,15 @@ import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -50,7 +52,7 @@ public class FumikoTheLowblood extends CardImpl { public FumikoTheLowblood(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/f/FuneralCharm.java b/Mage.Sets/src/mage/cards/f/FuneralCharm.java index 807404b951f..c8cfc64178d 100644 --- a/Mage.Sets/src/mage/cards/f/FuneralCharm.java +++ b/Mage.Sets/src/mage/cards/f/FuneralCharm.java @@ -27,20 +27,20 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Mode; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FungalBehemoth.java b/Mage.Sets/src/mage/cards/f/FungalBehemoth.java index cb746e715e4..f63ed790e03 100644 --- a/Mage.Sets/src/mage/cards/f/FungalBehemoth.java +++ b/Mage.Sets/src/mage/cards/f/FungalBehemoth.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -51,6 +50,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FungalBloom.java b/Mage.Sets/src/mage/cards/f/FungalBloom.java index 93faf2d139a..98decb7ba37 100644 --- a/Mage.Sets/src/mage/cards/f/FungalBloom.java +++ b/Mage.Sets/src/mage/cards/f/FungalBloom.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FungalReaches.java b/Mage.Sets/src/mage/cards/f/FungalReaches.java index b7a72f10c3a..e4801748098 100644 --- a/Mage.Sets/src/mage/cards/f/FungalReaches.java +++ b/Mage.Sets/src/mage/cards/f/FungalReaches.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; @@ -45,6 +44,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FungalShambler.java b/Mage.Sets/src/mage/cards/f/FungalShambler.java index d1b8633cec3..d7b46bf6f76 100644 --- a/Mage.Sets/src/mage/cards/f/FungalShambler.java +++ b/Mage.Sets/src/mage/cards/f/FungalShambler.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToOpponentTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FungalSprouting.java b/Mage.Sets/src/mage/cards/f/FungalSprouting.java index 20341ff2676..e304ee2714b 100644 --- a/Mage.Sets/src/mage/cards/f/FungalSprouting.java +++ b/Mage.Sets/src/mage/cards/f/FungalSprouting.java @@ -27,15 +27,15 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.GreatestPowerAmongControlledCreaturesValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SaprolingToken; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FungusSliver.java b/Mage.Sets/src/mage/cards/f/FungusSliver.java index 5b0e0ae689c..4368c90fea2 100644 --- a/Mage.Sets/src/mage/cards/f/FungusSliver.java +++ b/Mage.Sets/src/mage/cards/f/FungusSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/f/Fungusaur.java b/Mage.Sets/src/mage/cards/f/Fungusaur.java index a0a0811a1d6..a82ce6c9897 100644 --- a/Mage.Sets/src/mage/cards/f/Fungusaur.java +++ b/Mage.Sets/src/mage/cards/f/Fungusaur.java @@ -27,17 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FuriousAssault.java b/Mage.Sets/src/mage/cards/f/FuriousAssault.java index 8570921ed40..8f409f4ca1a 100644 --- a/Mage.Sets/src/mage/cards/f/FuriousAssault.java +++ b/Mage.Sets/src/mage/cards/f/FuriousAssault.java @@ -27,8 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -38,6 +36,8 @@ import mage.constants.CardType; import mage.filter.StaticFilters; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/f/FuriousReprisal.java b/Mage.Sets/src/mage/cards/f/FuriousReprisal.java index 4615422f862..ce80d4d26de 100644 --- a/Mage.Sets/src/mage/cards/f/FuriousReprisal.java +++ b/Mage.Sets/src/mage/cards/f/FuriousReprisal.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FuriousResistance.java b/Mage.Sets/src/mage/cards/f/FuriousResistance.java index 3779352df06..636035d6189 100644 --- a/Mage.Sets/src/mage/cards/f/FuriousResistance.java +++ b/Mage.Sets/src/mage/cards/f/FuriousResistance.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -38,6 +35,7 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.common.FilterBlockingCreature; @@ -47,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FurnaceBrood.java b/Mage.Sets/src/mage/cards/f/FurnaceBrood.java index fb468bccba6..56ea9dd6664 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceBrood.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceBrood.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java b/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java index c07b9f342ed..5354c0be680 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/f/FurnaceDragon.java b/Mage.Sets/src/mage/cards/f/FurnaceDragon.java index dc9a1c59fd0..a0b754c0088 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceDragon.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.CastFromHandSourceCondition; @@ -42,6 +41,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java b/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java index b0cf1aa9755..a69be2774e6 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java @@ -27,17 +27,20 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FurnaceScamp.java b/Mage.Sets/src/mage/cards/f/FurnaceScamp.java index c9a838e0af8..fea98732172 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceScamp.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceScamp.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java b/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java index eeff4ec9a84..ccd0d7e9677 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java b/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java index 13a9178deac..c4f72aaf367 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java @@ -27,9 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -37,6 +34,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java index a6f8afd68cd..f06d4b4f88a 100644 --- a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java +++ b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -37,14 +36,12 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/f/FurtiveHomunculus.java b/Mage.Sets/src/mage/cards/f/FurtiveHomunculus.java index 4743b0b69f3..e71cf9d13af 100644 --- a/Mage.Sets/src/mage/cards/f/FurtiveHomunculus.java +++ b/Mage.Sets/src/mage/cards/f/FurtiveHomunculus.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.SkulkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/f/FuryCharm.java b/Mage.Sets/src/mage/cards/f/FuryCharm.java index e1b5aec3663..f1e6009a52f 100644 --- a/Mage.Sets/src/mage/cards/f/FuryCharm.java +++ b/Mage.Sets/src/mage/cards/f/FuryCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.Effect; @@ -53,6 +52,8 @@ import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetPermanentOrSuspendedCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FuryOfTheHorde.java b/Mage.Sets/src/mage/cards/f/FuryOfTheHorde.java index febebc4f2c4..424044f71f2 100644 --- a/Mage.Sets/src/mage/cards/f/FuryOfTheHorde.java +++ b/Mage.Sets/src/mage/cards/f/FuryOfTheHorde.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; @@ -41,6 +40,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FurySliver.java b/Mage.Sets/src/mage/cards/f/FurySliver.java index 4ae3869fc29..d13e7498a0c 100644 --- a/Mage.Sets/src/mage/cards/f/FurySliver.java +++ b/Mage.Sets/src/mage/cards/f/FurySliver.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author Sir-Speshkitty diff --git a/Mage.Sets/src/mage/cards/f/FurybladeVampire.java b/Mage.Sets/src/mage/cards/f/FurybladeVampire.java index f2527644a30..6f7f8285339 100644 --- a/Mage.Sets/src/mage/cards/f/FurybladeVampire.java +++ b/Mage.Sets/src/mage/cards/f/FurybladeVampire.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/f/FurybornHellkite.java b/Mage.Sets/src/mage/cards/f/FurybornHellkite.java index 3f67c229c4b..6436a91a61a 100644 --- a/Mage.Sets/src/mage/cards/f/FurybornHellkite.java +++ b/Mage.Sets/src/mage/cards/f/FurybornHellkite.java @@ -27,13 +27,14 @@ */ package mage.cards.f; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java index 664346631fc..a0cbc12b078 100644 --- a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java +++ b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/f/FusionElemental.java b/Mage.Sets/src/mage/cards/f/FusionElemental.java index fc75210f8f8..9e0bb97b85d 100644 --- a/Mage.Sets/src/mage/cards/f/FusionElemental.java +++ b/Mage.Sets/src/mage/cards/f/FusionElemental.java @@ -28,12 +28,13 @@ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/f/FutureSight.java b/Mage.Sets/src/mage/cards/f/FutureSight.java index 75c08ad8349..0696aad86ee 100644 --- a/Mage.Sets/src/mage/cards/f/FutureSight.java +++ b/Mage.Sets/src/mage/cards/f/FutureSight.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.PlayTheTopCardEffect; import mage.abilities.effects.common.continuous.PlayWithTheTopCardRevealedEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/Fylamarid.java b/Mage.Sets/src/mage/cards/f/Fylamarid.java index b3dc20a579c..075aa8d6f52 100644 --- a/Mage.Sets/src/mage/cards/f/Fylamarid.java +++ b/Mage.Sets/src/mage/cards/f/Fylamarid.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -46,6 +45,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FyndhornBow.java b/Mage.Sets/src/mage/cards/f/FyndhornBow.java index c0a57072b9a..a88895418cb 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornBow.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornBow.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java b/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java index 043e7242dc8..2c4a46eb58e 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java @@ -27,7 +27,6 @@ */ package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/f/FyndhornElder.java b/Mage.Sets/src/mage/cards/f/FyndhornElder.java index 1a55aa3f5bd..76a2b11991b 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornElder.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornElder.java @@ -27,17 +27,17 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/f/FyndhornElves.java b/Mage.Sets/src/mage/cards/f/FyndhornElves.java index 52cf230cd7d..5c78bc1c9d1 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornElves.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornElves.java @@ -27,13 +27,13 @@ */ package mage.cards.f; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GaddockTeeg.java b/Mage.Sets/src/mage/cards/g/GaddockTeeg.java index e4f9016f97a..95f911ea582 100644 --- a/Mage.Sets/src/mage/cards/g/GaddockTeeg.java +++ b/Mage.Sets/src/mage/cards/g/GaddockTeeg.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,13 +34,12 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author Plopman @@ -50,7 +48,7 @@ public class GaddockTeeg extends CardImpl { public GaddockTeeg(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kithkin"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/g/GaeasAnthem.java b/Mage.Sets/src/mage/cards/g/GaeasAnthem.java index e6e5c2871c0..85b5f82554d 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasAnthem.java +++ b/Mage.Sets/src/mage/cards/g/GaeasAnthem.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; @@ -38,6 +36,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/g/GaeasAvenger.java b/Mage.Sets/src/mage/cards/g/GaeasAvenger.java index dd38e21afc6..3c5986a72fc 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasAvenger.java +++ b/Mage.Sets/src/mage/cards/g/GaeasAvenger.java @@ -27,9 +27,9 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.dynamicvalue.IntPlusDynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; @@ -40,7 +40,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.ControllerPredicate; -import mage.abilities.dynamicvalue.IntPlusDynamicValue; + +import java.util.UUID; /** diff --git a/Mage.Sets/src/mage/cards/g/GaeasBlessing.java b/Mage.Sets/src/mage/cards/g/GaeasBlessing.java index a29262fff65..d1e4b684aed 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasBlessing.java +++ b/Mage.Sets/src/mage/cards/g/GaeasBlessing.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -45,6 +43,9 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCardInGraveyard; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GaeasBounty.java b/Mage.Sets/src/mage/cards/g/GaeasBounty.java index 23678504a34..1485fa82985 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasBounty.java +++ b/Mage.Sets/src/mage/cards/g/GaeasBounty.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,6 +35,8 @@ import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author hanasu diff --git a/Mage.Sets/src/mage/cards/g/GaeasCradle.java b/Mage.Sets/src/mage/cards/g/GaeasCradle.java index f854815edd2..6eea3c3f552 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasCradle.java +++ b/Mage.Sets/src/mage/cards/g/GaeasCradle.java @@ -27,16 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Backfir3 @@ -51,7 +53,7 @@ public class GaeasCradle extends CardImpl { public GaeasCradle(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {T}: Add {G} to your mana pool for each creature you control. DynamicManaAbility ability = new DynamicManaAbility(Mana.GreenMana(1), new PermanentsOnBattlefieldCount(filter)); diff --git a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java index 66d06817881..d30e275ce1c 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java +++ b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,14 +40,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Backfir3 */ diff --git a/Mage.Sets/src/mage/cards/g/GaeasHerald.java b/Mage.Sets/src/mage/cards/g/GaeasHerald.java index f21a71668c3..5e1eac78d85 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasHerald.java +++ b/Mage.Sets/src/mage/cards/g/GaeasHerald.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GaeasLiege.java b/Mage.Sets/src/mage/cards/g/GaeasLiege.java index 52014ab9381..694bba7e70f 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasLiege.java +++ b/Mage.Sets/src/mage/cards/g/GaeasLiege.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -54,6 +53,8 @@ import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/g/GaeasMight.java b/Mage.Sets/src/mage/cards/g/GaeasMight.java index 00e92b1361b..a0ebf599de8 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasMight.java +++ b/Mage.Sets/src/mage/cards/g/GaeasMight.java @@ -27,16 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GaeasRevenge.java b/Mage.Sets/src/mage/cards/g/GaeasRevenge.java index b0a5b9b1d18..0b66d5f9215 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasRevenge.java +++ b/Mage.Sets/src/mage/cards/g/GaeasRevenge.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.filter.FilterStackObject; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GaeasSkyfolk.java b/Mage.Sets/src/mage/cards/g/GaeasSkyfolk.java index bb70177a3a4..f1fac61d252 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasSkyfolk.java +++ b/Mage.Sets/src/mage/cards/g/GaeasSkyfolk.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GaeasTouch.java b/Mage.Sets/src/mage/cards/g/GaeasTouch.java index 90ebba87603..6b7306504f0 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasTouch.java +++ b/Mage.Sets/src/mage/cards/g/GaeasTouch.java @@ -27,21 +27,17 @@ */ package mage.cards.g; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; import mage.Mana; -import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.mana.SimpleManaAbility; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; +import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; +import mage.abilities.mana.SimpleManaAbility; import mage.cards.Card; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TimingRule; -import mage.constants.Zone; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -51,6 +47,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author spjspj @@ -84,7 +82,7 @@ class PutBasicForestOnBattlefieldEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("basic Forest card"); static { - filter.add(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate("Basic"))); + filter.add(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate(SuperType.BASIC))); filter.add(new SubtypePredicate("Forest")); } diff --git a/Mage.Sets/src/mage/cards/g/GahijiHonoredOne.java b/Mage.Sets/src/mage/cards/g/GahijiHonoredOne.java index 45193630fbe..b792e2edcf1 100644 --- a/Mage.Sets/src/mage/cards/g/GahijiHonoredOne.java +++ b/Mage.Sets/src/mage/cards/g/GahijiHonoredOne.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -37,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -45,6 +44,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class GahijiHonoredOne extends CardImpl { public GahijiHonoredOne(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Beast"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/g/Gainsay.java b/Mage.Sets/src/mage/cards/g/Gainsay.java index 47e1ee6ad1e..f332167d794 100644 --- a/Mage.Sets/src/mage/cards/g/Gainsay.java +++ b/Mage.Sets/src/mage/cards/g/Gainsay.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.Target; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GaleForce.java b/Mage.Sets/src/mage/cards/g/GaleForce.java index 6a6e47d1542..891f9ea24d2 100644 --- a/Mage.Sets/src/mage/cards/g/GaleForce.java +++ b/Mage.Sets/src/mage/cards/g/GaleForce.java @@ -28,16 +28,16 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GalepowderMage.java b/Mage.Sets/src/mage/cards/g/GalepowderMage.java index acc87936eb0..5de7b216087 100644 --- a/Mage.Sets/src/mage/cards/g/GalepowderMage.java +++ b/Mage.Sets/src/mage/cards/g/GalepowderMage.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -51,6 +50,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GaleriderSliver.java b/Mage.Sets/src/mage/cards/g/GaleriderSliver.java index a02809d7a82..33a818a9edf 100644 --- a/Mage.Sets/src/mage/cards/g/GaleriderSliver.java +++ b/Mage.Sets/src/mage/cards/g/GaleriderSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GalinasKnight.java b/Mage.Sets/src/mage/cards/g/GalinasKnight.java index 80f6af3a4a6..3c211eb7451 100644 --- a/Mage.Sets/src/mage/cards/g/GalinasKnight.java +++ b/Mage.Sets/src/mage/cards/g/GalinasKnight.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/g/Gallantry.java b/Mage.Sets/src/mage/cards/g/Gallantry.java index eb0ab89e3b8..fccf3d5fe5c 100644 --- a/Mage.Sets/src/mage/cards/g/Gallantry.java +++ b/Mage.Sets/src/mage/cards/g/Gallantry.java @@ -27,18 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterBlockingCreature; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Gallowbraid.java b/Mage.Sets/src/mage/cards/g/Gallowbraid.java index fbc590f4747..989a21e2ed8 100644 --- a/Mage.Sets/src/mage/cards/g/Gallowbraid.java +++ b/Mage.Sets/src/mage/cards/g/Gallowbraid.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.keyword.CumulativeUpkeepAbility; @@ -35,6 +34,9 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class Gallowbraid extends CardImpl { public Gallowbraid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Horror"); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java index bc1b3f797e6..6b461fe3fa2 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -51,6 +50,8 @@ import mage.players.Player; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/g/GallowsWarden.java b/Mage.Sets/src/mage/cards/g/GallowsWarden.java index cb7f837cc77..8a9503d2d20 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsWarden.java +++ b/Mage.Sets/src/mage/cards/g/GallowsWarden.java @@ -27,13 +27,13 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java b/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java index 9e4ccd33ea9..43b04d478a5 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/g/GalvanicArc.java b/Mage.Sets/src/mage/cards/g/GalvanicArc.java index dd90199d959..8dd60cb04d7 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicArc.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicArc.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,10 +37,16 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GalvanicBlast.java b/Mage.Sets/src/mage/cards/g/GalvanicBlast.java index e5c807f1d31..bb5e199a52c 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicBlast.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicBlast.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GalvanicBombardment.java b/Mage.Sets/src/mage/cards/g/GalvanicBombardment.java index a6cf6f2a74c..28ee3c4bc14 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicBombardment.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicBombardment.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java b/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java index f4f131429e4..8b7a33a5da0 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -38,6 +35,10 @@ import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GalvanicKey.java b/Mage.Sets/src/mage/cards/g/GalvanicKey.java index 0d166bdfd14..8ce47e0c0cf 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicKey.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicKey.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,11 +35,14 @@ import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Galvanoth.java b/Mage.Sets/src/mage/cards/g/Galvanoth.java index fc282da54e1..0025b3855e4 100644 --- a/Mage.Sets/src/mage/cards/g/Galvanoth.java +++ b/Mage.Sets/src/mage/cards/g/Galvanoth.java @@ -27,23 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * @author North */ diff --git a/Mage.Sets/src/mage/cards/g/Gamble.java b/Mage.Sets/src/mage/cards/g/Gamble.java index d81e3d673df..737c516b4c1 100644 --- a/Mage.Sets/src/mage/cards/g/Gamble.java +++ b/Mage.Sets/src/mage/cards/g/Gamble.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GameOfChaos.java b/Mage.Sets/src/mage/cards/g/GameOfChaos.java index e59575b636a..4dd02e5708d 100644 --- a/Mage.Sets/src/mage/cards/g/GameOfChaos.java +++ b/Mage.Sets/src/mage/cards/g/GameOfChaos.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/GameTrail.java b/Mage.Sets/src/mage/cards/g/GameTrail.java index 61139e6aca6..14555bce92d 100644 --- a/Mage.Sets/src/mage/cards/g/GameTrail.java +++ b/Mage.Sets/src/mage/cards/g/GameTrail.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -41,6 +40,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GameTrailChangeling.java b/Mage.Sets/src/mage/cards/g/GameTrailChangeling.java index 66b4d4a17ea..36004c70b3a 100644 --- a/Mage.Sets/src/mage/cards/g/GameTrailChangeling.java +++ b/Mage.Sets/src/mage/cards/g/GameTrailChangeling.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/Gamekeeper.java b/Mage.Sets/src/mage/cards/g/Gamekeeper.java index d37853a9c3f..9e3d4b9eda7 100644 --- a/Mage.Sets/src/mage/cards/g/Gamekeeper.java +++ b/Mage.Sets/src/mage/cards/g/Gamekeeper.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GamorreanPrisonGuard.java b/Mage.Sets/src/mage/cards/g/GamorreanPrisonGuard.java index 6cefc3b016a..b994e078cf6 100644 --- a/Mage.Sets/src/mage/cards/g/GamorreanPrisonGuard.java +++ b/Mage.Sets/src/mage/cards/g/GamorreanPrisonGuard.java @@ -27,18 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -46,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GangOfDevils.java b/Mage.Sets/src/mage/cards/g/GangOfDevils.java index 1c4a8e27aca..590b49624cf 100644 --- a/Mage.Sets/src/mage/cards/g/GangOfDevils.java +++ b/Mage.Sets/src/mage/cards/g/GangOfDevils.java @@ -27,13 +27,13 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayerAmount; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GangOfElk.java b/Mage.Sets/src/mage/cards/g/GangOfElk.java index 546e267a551..1bc1d1408e9 100644 --- a/Mage.Sets/src/mage/cards/g/GangOfElk.java +++ b/Mage.Sets/src/mage/cards/g/GangOfElk.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GangrenousGoliath.java b/Mage.Sets/src/mage/cards/g/GangrenousGoliath.java index feb3019db84..0bca24643cc 100644 --- a/Mage.Sets/src/mage/cards/g/GangrenousGoliath.java +++ b/Mage.Sets/src/mage/cards/g/GangrenousGoliath.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GargoyleCastle.java b/Mage.Sets/src/mage/cards/g/GargoyleCastle.java index 2ed252a2dc8..a60b0075fe0 100644 --- a/Mage.Sets/src/mage/cards/g/GargoyleCastle.java +++ b/Mage.Sets/src/mage/cards/g/GargoyleCastle.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java b/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java index 435922722e8..367df8b3c29 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java +++ b/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -44,11 +43,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -61,6 +56,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GarrukCallerOfBeasts.java b/Mage.Sets/src/mage/cards/g/GarrukCallerOfBeasts.java index 6f8f9e039c6..06b88647913 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukCallerOfBeasts.java +++ b/Mage.Sets/src/mage/cards/g/GarrukCallerOfBeasts.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -49,6 +48,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.command.Emblem; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GarrukPrimalHunter.java b/Mage.Sets/src/mage/cards/g/GarrukPrimalHunter.java index 37ac70b982d..b8f3892300e 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukPrimalHunter.java +++ b/Mage.Sets/src/mage/cards/g/GarrukPrimalHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.token.BeastToken; import mage.game.permanent.token.WurmToken; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GarrukRelentless.java b/Mage.Sets/src/mage/cards/g/GarrukRelentless.java index e030f9501ab..1fec63cb28b 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukRelentless.java +++ b/Mage.Sets/src/mage/cards/g/GarrukRelentless.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.TriggeredAbilityImpl; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.WolfToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java b/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java index b2497bfad82..420f9bf5e7b 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java +++ b/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -38,12 +37,11 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.*; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; @@ -55,6 +53,8 @@ import mage.target.Target; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/g/GarrukWildspeaker.java b/Mage.Sets/src/mage/cards/g/GarrukWildspeaker.java index e2635c6f880..1580ca4ce4c 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/cards/g/GarrukWildspeaker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.BeastToken; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GarruksCompanion.java b/Mage.Sets/src/mage/cards/g/GarruksCompanion.java index 5b92bbf41e9..c50be10deba 100644 --- a/Mage.Sets/src/mage/cards/g/GarruksCompanion.java +++ b/Mage.Sets/src/mage/cards/g/GarruksCompanion.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GarruksHorde.java b/Mage.Sets/src/mage/cards/g/GarruksHorde.java index e1e568dd9b3..04fcb25a7a0 100644 --- a/Mage.Sets/src/mage/cards/g/GarruksHorde.java +++ b/Mage.Sets/src/mage/cards/g/GarruksHorde.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/g/GarruksPackleader.java b/Mage.Sets/src/mage/cards/g/GarruksPackleader.java index 2a200cd6242..9585d3336d5 100644 --- a/Mage.Sets/src/mage/cards/g/GarruksPackleader.java +++ b/Mage.Sets/src/mage/cards/g/GarruksPackleader.java @@ -28,20 +28,21 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GarrulousSycophant.java b/Mage.Sets/src/mage/cards/g/GarrulousSycophant.java index 23efc3dd39a..73887f59786 100644 --- a/Mage.Sets/src/mage/cards/g/GarrulousSycophant.java +++ b/Mage.Sets/src/mage/cards/g/GarrulousSycophant.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GarzaZolPlagueQueen.java b/Mage.Sets/src/mage/cards/g/GarzaZolPlagueQueen.java index a1ddb14411d..671246a850a 100644 --- a/Mage.Sets/src/mage/cards/g/GarzaZolPlagueQueen.java +++ b/Mage.Sets/src/mage/cards/g/GarzaZolPlagueQueen.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; @@ -38,8 +37,11 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author fireshoes @@ -48,7 +50,7 @@ public class GarzaZolPlagueQueen extends CardImpl { public GarzaZolPlagueQueen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/g/GaseousForm.java b/Mage.Sets/src/mage/cards/g/GaseousForm.java index e92210a037d..c5aef96524b 100644 --- a/Mage.Sets/src/mage/cards/g/GaseousForm.java +++ b/Mage.Sets/src/mage/cards/g/GaseousForm.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.PreventAllDamageToAndByAttachedEffect; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GateHound.java b/Mage.Sets/src/mage/cards/g/GateHound.java index e02194775bf..92ff28eebca 100644 --- a/Mage.Sets/src/mage/cards/g/GateHound.java +++ b/Mage.Sets/src/mage/cards/g/GateHound.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedSourceCondition; @@ -39,8 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GateSmasher.java b/Mage.Sets/src/mage/cards/g/GateSmasher.java index 369ad568d08..95254070e14 100644 --- a/Mage.Sets/src/mage/cards/g/GateSmasher.java +++ b/Mage.Sets/src/mage/cards/g/GateSmasher.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AttachableToRestrictedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -49,6 +48,8 @@ import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GateToPhyrexia.java b/Mage.Sets/src/mage/cards/g/GateToPhyrexia.java index ec870fce7d1..6708ce4e345 100644 --- a/Mage.Sets/src/mage/cards/g/GateToPhyrexia.java +++ b/Mage.Sets/src/mage/cards/g/GateToPhyrexia.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.condition.common.IsStepCondition; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GateToTheAether.java b/Mage.Sets/src/mage/cards/g/GateToTheAether.java index 3bc32a36357..b690bf81d03 100644 --- a/Mage.Sets/src/mage/cards/g/GateToTheAether.java +++ b/Mage.Sets/src/mage/cards/g/GateToTheAether.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GatecreeperVine.java b/Mage.Sets/src/mage/cards/g/GatecreeperVine.java index 45727d76756..c81c89f48fa 100644 --- a/Mage.Sets/src/mage/cards/g/GatecreeperVine.java +++ b/Mage.Sets/src/mage/cards/g/GatecreeperVine.java @@ -27,14 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -42,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class GatecreeperVine extends CardImpl { Predicates.or( Predicates.and( new CardTypePredicate(CardType.LAND), - new SupertypePredicate("Basic")), + new SupertypePredicate(SuperType.BASIC)), new SubtypePredicate("Gate"))); } diff --git a/Mage.Sets/src/mage/cards/g/GatekeeperOfMalakir.java b/Mage.Sets/src/mage/cards/g/GatekeeperOfMalakir.java index 7ec3b3182b9..66f973b7a16 100644 --- a/Mage.Sets/src/mage/cards/g/GatekeeperOfMalakir.java +++ b/Mage.Sets/src/mage/cards/g/GatekeeperOfMalakir.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/g/GatewayShade.java b/Mage.Sets/src/mage/cards/g/GatewayShade.java index 4a4d90f034e..064dbb7d4af 100644 --- a/Mage.Sets/src/mage/cards/g/GatewayShade.java +++ b/Mage.Sets/src/mage/cards/g/GatewayShade.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -38,12 +34,17 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GathanRaiders.java b/Mage.Sets/src/mage/cards/g/GathanRaiders.java index a38b24948f8..bad8835b05f 100644 --- a/Mage.Sets/src/mage/cards/g/GathanRaiders.java +++ b/Mage.Sets/src/mage/cards/g/GathanRaiders.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HellbentCondition; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GatherCourage.java b/Mage.Sets/src/mage/cards/g/GatherCourage.java index e95bfbe652a..af4fe5b3c3f 100644 --- a/Mage.Sets/src/mage/cards/g/GatherCourage.java +++ b/Mage.Sets/src/mage/cards/g/GatherCourage.java @@ -27,16 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GatherSpecimens.java b/Mage.Sets/src/mage/cards/g/GatherSpecimens.java index 3d299f9a7ec..cbb937233e7 100644 --- a/Mage.Sets/src/mage/cards/g/GatherSpecimens.java +++ b/Mage.Sets/src/mage/cards/g/GatherSpecimens.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; @@ -42,6 +41,8 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GatherThePack.java b/Mage.Sets/src/mage/cards/g/GatherThePack.java index c0ca44edcf8..5c699d93745 100644 --- a/Mage.Sets/src/mage/cards/g/GatherThePack.java +++ b/Mage.Sets/src/mage/cards/g/GatherThePack.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.condition.common.SpellMasteryCondition; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java b/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java index d95e6381910..08a28099853 100644 --- a/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java +++ b/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.HumanToken; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/g/GatstafArsonists.java b/Mage.Sets/src/mage/cards/g/GatstafArsonists.java index c11628265eb..997b0ab4796 100644 --- a/Mage.Sets/src/mage/cards/g/GatstafArsonists.java +++ b/Mage.Sets/src/mage/cards/g/GatstafArsonists.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GatstafHowler.java b/Mage.Sets/src/mage/cards/g/GatstafHowler.java index 1af7d7fc381..3757aedff75 100644 --- a/Mage.Sets/src/mage/cards/g/GatstafHowler.java +++ b/Mage.Sets/src/mage/cards/g/GatstafHowler.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.keyword.IntimidateAbility; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GatstafRavagers.java b/Mage.Sets/src/mage/cards/g/GatstafRavagers.java index f4575078243..db8ddebc381 100644 --- a/Mage.Sets/src/mage/cards/g/GatstafRavagers.java +++ b/Mage.Sets/src/mage/cards/g/GatstafRavagers.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GatstafShepherd.java b/Mage.Sets/src/mage/cards/g/GatstafShepherd.java index 28e1f334286..c5b1cca4cf9 100644 --- a/Mage.Sets/src/mage/cards/g/GatstafShepherd.java +++ b/Mage.Sets/src/mage/cards/g/GatstafShepherd.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java index 243d9148bbe..9f96294169e 100644 --- a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java +++ b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.Mana; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -37,16 +36,14 @@ import mage.abilities.effects.common.ManaEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfPower.java b/Mage.Sets/src/mage/cards/g/GauntletOfPower.java index 48c270ac156..53f54052e2b 100644 --- a/Mage.Sets/src/mage/cards/g/GauntletOfPower.java +++ b/Mage.Sets/src/mage/cards/g/GauntletOfPower.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,13 +39,7 @@ import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; @@ -59,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +63,7 @@ public class GauntletOfPower extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a basic land"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public GauntletOfPower(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GavonyIronwright.java b/Mage.Sets/src/mage/cards/g/GavonyIronwright.java index b0d8e10cc65..d873bd5930e 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyIronwright.java +++ b/Mage.Sets/src/mage/cards/g/GavonyIronwright.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FatefulHourCondition; @@ -37,9 +34,12 @@ import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GavonyTownship.java b/Mage.Sets/src/mage/cards/g/GavonyTownship.java index 40217135672..059b9944699 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyTownship.java +++ b/Mage.Sets/src/mage/cards/g/GavonyTownship.java @@ -1,6 +1,5 @@ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -14,6 +13,8 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + public class GavonyTownship extends CardImpl { public GavonyTownship(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java b/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java index 28d75cc0859..3da14e0bbde 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java +++ b/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java b/Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java index 9be95c16496..457bbc5e88b 100644 --- a/Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java +++ b/Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GazeOfGranite.java b/Mage.Sets/src/mage/cards/g/GazeOfGranite.java index 242bb2fba2f..3d5981ba961 100644 --- a/Mage.Sets/src/mage/cards/g/GazeOfGranite.java +++ b/Mage.Sets/src/mage/cards/g/GazeOfGranite.java @@ -27,19 +27,20 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GazeOfJustice.java b/Mage.Sets/src/mage/cards/g/GazeOfJustice.java index c730c584e05..e313c0e606b 100644 --- a/Mage.Sets/src/mage/cards/g/GazeOfJustice.java +++ b/Mage.Sets/src/mage/cards/g/GazeOfJustice.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java b/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java index abb7c979698..8e8efe2d49f 100644 --- a/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java +++ b/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,16 +36,14 @@ import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GearshiftAce.java b/Mage.Sets/src/mage/cards/g/GearshiftAce.java index 0b2355c60b4..7a026944a3b 100644 --- a/Mage.Sets/src/mage/cards/g/GearshiftAce.java +++ b/Mage.Sets/src/mage/cards/g/GearshiftAce.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.CrewsVehicleSourceTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GeierReachBandit.java b/Mage.Sets/src/mage/cards/g/GeierReachBandit.java index aaa7c979e3d..8e91e6ccee9 100644 --- a/Mage.Sets/src/mage/cards/g/GeierReachBandit.java +++ b/Mage.Sets/src/mage/cards/g/GeierReachBandit.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -36,12 +35,14 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TransformAbility; -import mage.cards.v.VildinPackAlpha; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.v.VildinPackAlpha; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java b/Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java index c6a7a1f1d96..7edccb250b2 100644 --- a/Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java +++ b/Mage.Sets/src/mage/cards/g/GeierReachSanitarium.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,8 +38,11 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes @@ -49,7 +51,7 @@ public class GeierReachSanitarium extends CardImpl { public GeierReachSanitarium(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java b/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java index eb6de9876e5..acf2b716589 100644 --- a/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java +++ b/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/GeistHonoredMonk.java b/Mage.Sets/src/mage/cards/g/GeistHonoredMonk.java index aacc72c6c77..3789fec3c84 100644 --- a/Mage.Sets/src/mage/cards/g/GeistHonoredMonk.java +++ b/Mage.Sets/src/mage/cards/g/GeistHonoredMonk.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.permanent.token.SpiritWhiteToken; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/g/GeistOfSaintTraft.java b/Mage.Sets/src/mage/cards/g/GeistOfSaintTraft.java index 80759f534b7..65e10ddaffc 100644 --- a/Mage.Sets/src/mage/cards/g/GeistOfSaintTraft.java +++ b/Mage.Sets/src/mage/cards/g/GeistOfSaintTraft.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -38,10 +37,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.token.AngelToken; import mage.players.Player; +import java.util.UUID; + /** * @author Loki */ @@ -49,7 +51,7 @@ public class GeistOfSaintTraft extends CardImpl { public GeistOfSaintTraft(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/g/GeistOfTheArchives.java b/Mage.Sets/src/mage/cards/g/GeistOfTheArchives.java index 01daffca708..6ee86042d7e 100644 --- a/Mage.Sets/src/mage/cards/g/GeistOfTheArchives.java +++ b/Mage.Sets/src/mage/cards/g/GeistOfTheArchives.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.keyword.ScryEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java b/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java index b039ef7eeeb..abe9d1ad2b3 100644 --- a/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java +++ b/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DeliriumCondition; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GeistOfTheMoors.java b/Mage.Sets/src/mage/cards/g/GeistOfTheMoors.java index 47bd744c64b..630b830b143 100644 --- a/Mage.Sets/src/mage/cards/g/GeistOfTheMoors.java +++ b/Mage.Sets/src/mage/cards/g/GeistOfTheMoors.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GeistSnatch.java b/Mage.Sets/src/mage/cards/g/GeistSnatch.java index 536ea6995ee..a0efdbdd784 100644 --- a/Mage.Sets/src/mage/cards/g/GeistSnatch.java +++ b/Mage.Sets/src/mage/cards/g/GeistSnatch.java @@ -27,13 +27,13 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; diff --git a/Mage.Sets/src/mage/cards/g/GeistTrappers.java b/Mage.Sets/src/mage/cards/g/GeistTrappers.java index 8e8b7ef6527..4bc5c3b1ad1 100644 --- a/Mage.Sets/src/mage/cards/g/GeistTrappers.java +++ b/Mage.Sets/src/mage/cards/g/GeistTrappers.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityPairedEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/g/Geistblast.java b/Mage.Sets/src/mage/cards/g/Geistblast.java index 6563af8852c..5e651ff19e7 100644 --- a/Mage.Sets/src/mage/cards/g/Geistblast.java +++ b/Mage.Sets/src/mage/cards/g/Geistblast.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; @@ -46,6 +45,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GeistcatchersRig.java b/Mage.Sets/src/mage/cards/g/GeistcatchersRig.java index dffceea9c76..95c7c2404ec 100644 --- a/Mage.Sets/src/mage/cards/g/GeistcatchersRig.java +++ b/Mage.Sets/src/mage/cards/g/GeistcatchersRig.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,10 +34,13 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/Geistflame.java b/Mage.Sets/src/mage/cards/g/Geistflame.java index 9c692a34ba8..4a4e265a1b2 100644 --- a/Mage.Sets/src/mage/cards/g/Geistflame.java +++ b/Mage.Sets/src/mage/cards/g/Geistflame.java @@ -27,12 +27,12 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/cards/g/GelatinousGenesis.java b/Mage.Sets/src/mage/cards/g/GelatinousGenesis.java index 5c012bca88c..0a3db83763a 100644 --- a/Mage.Sets/src/mage/cards/g/GelatinousGenesis.java +++ b/Mage.Sets/src/mage/cards/g/GelatinousGenesis.java @@ -27,17 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.OozeToken; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/Gelectrode.java b/Mage.Sets/src/mage/cards/g/Gelectrode.java index 972debfacac..2b4966c6e61 100644 --- a/Mage.Sets/src/mage/cards/g/Gelectrode.java +++ b/Mage.Sets/src/mage/cards/g/Gelectrode.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterInstantOrSorcerySpell; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GelidShackles.java b/Mage.Sets/src/mage/cards/g/GelidShackles.java index 84f04690b9d..8dd3d7b4e98 100644 --- a/Mage.Sets/src/mage/cards/g/GelidShackles.java +++ b/Mage.Sets/src/mage/cards/g/GelidShackles.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,14 +38,12 @@ import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) @@ -55,7 +52,7 @@ public class GelidShackles extends CardImpl { public GelidShackles(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Aura"); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/g/GemOfBecoming.java b/Mage.Sets/src/mage/cards/g/GemOfBecoming.java index 5243c9ee435..c73e94ac6a8 100644 --- a/Mage.Sets/src/mage/cards/g/GemOfBecoming.java +++ b/Mage.Sets/src/mage/cards/g/GemOfBecoming.java @@ -27,27 +27,24 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GemhideSliver.java b/Mage.Sets/src/mage/cards/g/GemhideSliver.java index b99d0322161..5779e908d4b 100644 --- a/Mage.Sets/src/mage/cards/g/GemhideSliver.java +++ b/Mage.Sets/src/mage/cards/g/GemhideSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/g/GempalmAvenger.java b/Mage.Sets/src/mage/cards/g/GempalmAvenger.java index d27acccdf83..8085521e834 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmAvenger.java +++ b/Mage.Sets/src/mage/cards/g/GempalmAvenger.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GempalmIncinerator.java b/Mage.Sets/src/mage/cards/g/GempalmIncinerator.java index 8658de91f77..eed3d911310 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmIncinerator.java +++ b/Mage.Sets/src/mage/cards/g/GempalmIncinerator.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; @@ -38,10 +36,13 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GempalmPolluter.java b/Mage.Sets/src/mage/cards/g/GempalmPolluter.java index 67598fe135f..e4fd1c03e25 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmPolluter.java +++ b/Mage.Sets/src/mage/cards/g/GempalmPolluter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; @@ -43,6 +42,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GempalmStrider.java b/Mage.Sets/src/mage/cards/g/GempalmStrider.java index 2ecce095b6a..ffca7140672 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmStrider.java +++ b/Mage.Sets/src/mage/cards/g/GempalmStrider.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GemstoneArray.java b/Mage.Sets/src/mage/cards/g/GemstoneArray.java index 8c79266b6f6..0200eaa030d 100644 --- a/Mage.Sets/src/mage/cards/g/GemstoneArray.java +++ b/Mage.Sets/src/mage/cards/g/GemstoneArray.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java b/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java index 9cf89058ee9..493a3b15014 100644 --- a/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java +++ b/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.OpeningHandAction; @@ -46,6 +45,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -53,6 +53,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author emerald000 @@ -61,7 +63,7 @@ public class GemstoneCaverns extends CardImpl { public GemstoneCaverns(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // If Gemstone Caverns is in your opening hand and you're not playing first, you may begin the game with Gemstone Caverns on the battlefield with a luck counter on it. If you do, exile a card from your hand. this.addAbility(new GemstoneCavernsAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GemstoneMine.java b/Mage.Sets/src/mage/cards/g/GemstoneMine.java index 430c47be42b..5aec54a095c 100644 --- a/Mage.Sets/src/mage/cards/g/GemstoneMine.java +++ b/Mage.Sets/src/mage/cards/g/GemstoneMine.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.SourceHasCounterCondition; @@ -41,6 +40,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GeneralGrievous.java b/Mage.Sets/src/mage/cards/g/GeneralGrievous.java index ca4ca9a59e6..c01d1355f3c 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralGrievous.java +++ b/Mage.Sets/src/mage/cards/g/GeneralGrievous.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +37,12 @@ import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Styxo @@ -49,7 +51,7 @@ public class GeneralGrievous extends CardImpl { public GeneralGrievous(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kaleesh"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/g/GeneralTazri.java b/Mage.Sets/src/mage/cards/g/GeneralTazri.java index 91552b81411..4aa9994266d 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralTazri.java +++ b/Mage.Sets/src/mage/cards/g/GeneralTazri.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; @@ -50,6 +50,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +66,7 @@ public class GeneralTazri extends CardImpl { public GeneralTazri(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Ally"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java b/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java index 641bf2d0bf8..67b74c25896 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java +++ b/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java @@ -28,7 +28,6 @@ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.PreventAllDamageToAttachedEffect; @@ -37,11 +36,9 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GeneratorServant.java b/Mage.Sets/src/mage/cards/g/GeneratorServant.java index ba6375a97ce..7eec49e3d60 100644 --- a/Mage.Sets/src/mage/cards/g/GeneratorServant.java +++ b/Mage.Sets/src/mage/cards/g/GeneratorServant.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.Mana; @@ -43,19 +40,17 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.watchers.Watcher; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/Genesis.java b/Mage.Sets/src/mage/cards/g/Genesis.java index 73f256ea699..26e9108e92e 100644 --- a/Mage.Sets/src/mage/cards/g/Genesis.java +++ b/Mage.Sets/src/mage/cards/g/Genesis.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GenesisChamber.java b/Mage.Sets/src/mage/cards/g/GenesisChamber.java index 9c32f0ff6d9..a46fbe36bde 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisChamber.java +++ b/Mage.Sets/src/mage/cards/g/GenesisChamber.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.MyrToken; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GenesisHydra.java b/Mage.Sets/src/mage/cards/g/GenesisHydra.java index 244fe9ec2fa..32b8256e69d 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisHydra.java +++ b/Mage.Sets/src/mage/cards/g/GenesisHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -35,11 +34,7 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CastSourceTriggeredAbility; import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -54,6 +49,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GenesisWave.java b/Mage.Sets/src/mage/cards/g/GenesisWave.java index 858acc2c079..cfacef27b42 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisWave.java +++ b/Mage.Sets/src/mage/cards/g/GenesisWave.java @@ -27,17 +27,10 @@ */ package mage.cards.g; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -50,6 +43,10 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java index 3cb819d25f6..6912f9b7a9b 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java @@ -38,10 +38,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -58,7 +55,7 @@ public class GenjuOfTheRealm extends CardImpl { public GenjuOfTheRealm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}{U}{B}{R}{G}"); this.subtype.add("Aura"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Enchant Land TargetPermanent auraTarget = new TargetLandPermanent(); @@ -89,7 +86,7 @@ public class GenjuOfTheRealm extends CardImpl { SpiritToken() { super("Spirit", "legendary 8/12 Spirit creature with trample"); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); this.color.setWhite(true); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/cards/g/Geosurge.java b/Mage.Sets/src/mage/cards/g/Geosurge.java index 25efeb58948..a2955f88e9c 100644 --- a/Mage.Sets/src/mage/cards/g/Geosurge.java +++ b/Mage.Sets/src/mage/cards/g/Geosurge.java @@ -28,7 +28,6 @@ package mage.cards.g; import mage.ConditionalMana; -import mage.constants.CardType; import mage.Mana; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.BasicManaEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.Game; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GeothermalCrevice.java b/Mage.Sets/src/mage/cards/g/GeothermalCrevice.java index f9c80b48942..5507aff5169 100644 --- a/Mage.Sets/src/mage/cards/g/GeothermalCrevice.java +++ b/Mage.Sets/src/mage/cards/g/GeothermalCrevice.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -39,8 +36,11 @@ import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java b/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java index 2cb5c6ffabc..36cc543906f 100644 --- a/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java +++ b/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GeralfsMessenger.java b/Mage.Sets/src/mage/cards/g/GeralfsMessenger.java index c554ed54cfd..3f21f6a06bb 100644 --- a/Mage.Sets/src/mage/cards/g/GeralfsMessenger.java +++ b/Mage.Sets/src/mage/cards/g/GeralfsMessenger.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; @@ -36,6 +35,7 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetOpponent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GeralfsMindcrusher.java b/Mage.Sets/src/mage/cards/g/GeralfsMindcrusher.java index 1fdbc3ef0e4..df41fe6ce42 100644 --- a/Mage.Sets/src/mage/cards/g/GeralfsMindcrusher.java +++ b/Mage.Sets/src/mage/cards/g/GeralfsMindcrusher.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.UndyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GerrardCapashen.java b/Mage.Sets/src/mage/cards/g/GerrardCapashen.java index 02d4756ef3a..f7170dfb40d 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardCapashen.java +++ b/Mage.Sets/src/mage/cards/g/GerrardCapashen.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -38,15 +37,14 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author FenrisulfrX @@ -55,7 +53,7 @@ public class GerrardCapashen extends CardImpl { public GerrardCapashen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java b/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java index cbf08bb2473..211ec44d1ae 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java +++ b/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java @@ -27,18 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GerrardsCommand.java b/Mage.Sets/src/mage/cards/g/GerrardsCommand.java index cf5e4177878..0a41542e487 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardsCommand.java +++ b/Mage.Sets/src/mage/cards/g/GerrardsCommand.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author FenrisulfrX diff --git a/Mage.Sets/src/mage/cards/g/GerrardsIrregulars.java b/Mage.Sets/src/mage/cards/g/GerrardsIrregulars.java index f6868db7db5..fb3a6fb4f77 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardsIrregulars.java +++ b/Mage.Sets/src/mage/cards/g/GerrardsIrregulars.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; -import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.HasteAbility; +import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GerrardsVerdict.java b/Mage.Sets/src/mage/cards/g/GerrardsVerdict.java index 65ef3d37e4b..014f3893e68 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardsVerdict.java +++ b/Mage.Sets/src/mage/cards/g/GerrardsVerdict.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GerrardsWisdom.java b/Mage.Sets/src/mage/cards/g/GerrardsWisdom.java index 7a361c3128d..20ff6f16bb3 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardsWisdom.java +++ b/Mage.Sets/src/mage/cards/g/GerrardsWisdom.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.effects.common.GainLifeEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java index 3383e322c44..32d3fdd2e4d 100644 --- a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java +++ b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; @@ -50,6 +50,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInOpponentsGraveyard; +import java.util.UUID; + /** * * @author nantuko @@ -60,7 +62,7 @@ public class GethLordOfTheVault extends CardImpl { public GethLordOfTheVault(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/g/GethsGrimoire.java b/Mage.Sets/src/mage/cards/g/GethsGrimoire.java index 4d4eff517ff..e8ac7e494fa 100644 --- a/Mage.Sets/src/mage/cards/g/GethsGrimoire.java +++ b/Mage.Sets/src/mage/cards/g/GethsGrimoire.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.common.DiscardsACardOpponentTriggeredAbility; import mage.abilities.effects.Effect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GethsVerdict.java b/Mage.Sets/src/mage/cards/g/GethsVerdict.java index 80ca492ff53..c3d623305d4 100644 --- a/Mage.Sets/src/mage/cards/g/GethsVerdict.java +++ b/Mage.Sets/src/mage/cards/g/GethsVerdict.java @@ -28,15 +28,16 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GeyserGlider.java b/Mage.Sets/src/mage/cards/g/GeyserGlider.java index 2ce7317d33e..79c44b0a82b 100644 --- a/Mage.Sets/src/mage/cards/g/GeyserGlider.java +++ b/Mage.Sets/src/mage/cards/g/GeyserGlider.java @@ -27,17 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GeyserfieldStalker.java b/Mage.Sets/src/mage/cards/g/GeyserfieldStalker.java index 07fb2cbb53d..a1956515f0d 100644 --- a/Mage.Sets/src/mage/cards/g/GeyserfieldStalker.java +++ b/Mage.Sets/src/mage/cards/g/GeyserfieldStalker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java index a48fe4138b7..c6e9a477bb0 100644 --- a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java +++ b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java @@ -28,10 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; @@ -40,6 +36,11 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java index 577d06be7ba..cd4af223e5f 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java +++ b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GhastlyConscription.java b/Mage.Sets/src/mage/cards/g/GhastlyConscription.java index 948519adb2d..3c82f5b44a9 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyConscription.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyConscription.java @@ -27,11 +27,6 @@ */ package mage.cards.g; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCosts; @@ -51,6 +46,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.*; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GhastlyDemise.java b/Mage.Sets/src/mage/cards/g/GhastlyDemise.java index dd644caf355..6e08ed68e2d 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyDemise.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyDemise.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -44,6 +43,8 @@ import mage.target.Target; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FirstTargetPointer; +import java.util.UUID; + /** * * @author cbt33 diff --git a/Mage.Sets/src/mage/cards/g/GhastlyDiscovery.java b/Mage.Sets/src/mage/cards/g/GhastlyDiscovery.java index 9ea6daba008..a9b652ef849 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyDiscovery.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyDiscovery.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ConspireAbility; @@ -38,6 +37,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java b/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java index bd9b82a190c..429f93da208 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java @@ -27,17 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.ControlEnchantedEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java b/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java index f50db77be68..b1c17480c1f 100644 --- a/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java +++ b/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -51,6 +51,8 @@ import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 @@ -65,7 +67,7 @@ public class GhaveGuruOfSpores extends CardImpl { public GhaveGuruOfSpores(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Fungus"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/g/GhazbanOgre.java b/Mage.Sets/src/mage/cards/g/GhazbanOgre.java index 084da558aec..7b828e7e128 100644 --- a/Mage.Sets/src/mage/cards/g/GhazbanOgre.java +++ b/Mage.Sets/src/mage/cards/g/GhazbanOgre.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author MarcoMarin, Watch out! This one I actually made from scratch!(1st diff --git a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java index 92e5b8ce039..1c7fce8ba68 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.DamageTargetEffect; @@ -39,8 +38,10 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.TappedPredicate; -import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetControlledPermanent; +import mage.target.common.TargetCreatureOrPlayer; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GhirapurGearcrafter.java b/Mage.Sets/src/mage/cards/g/GhirapurGearcrafter.java index 8bf41e4cbe3..377e164c087 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurGearcrafter.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurGearcrafter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ThopterColorlessToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GhirapurGuide.java b/Mage.Sets/src/mage/cards/g/GhirapurGuide.java index d7f4ba93095..0f8a2ef7745 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurGuide.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java b/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java index 1204a3882b9..129cf12bac3 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GhirapurOsprey.java b/Mage.Sets/src/mage/cards/g/GhirapurOsprey.java index 7a46e813e9d..dfa3d0ff493 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurOsprey.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurOsprey.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GhituEncampment.java b/Mage.Sets/src/mage/cards/g/GhituEncampment.java index e95ad286d98..7b883544a5f 100644 --- a/Mage.Sets/src/mage/cards/g/GhituEncampment.java +++ b/Mage.Sets/src/mage/cards/g/GhituEncampment.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,8 +36,13 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GhituFire.java b/Mage.Sets/src/mage/cards/g/GhituFire.java index ff3fe2b8fe0..32b1190aee1 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFire.java +++ b/Mage.Sets/src/mage/cards/g/GhituFire.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.PayMoreToCastAsThoughtItHadFlashAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GhituFireEater.java b/Mage.Sets/src/mage/cards/g/GhituFireEater.java index 7ebf7d0acc1..bb994bc5a6e 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFireEater.java +++ b/Mage.Sets/src/mage/cards/g/GhituFireEater.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java b/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java index 7857158aea0..33061c49c09 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java +++ b/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -39,14 +38,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GhituSlinger.java b/Mage.Sets/src/mage/cards/g/GhituSlinger.java index e52f0b509f3..f0e3783fed5 100644 --- a/Mage.Sets/src/mage/cards/g/GhituSlinger.java +++ b/Mage.Sets/src/mage/cards/g/GhituSlinger.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/g/GhituWarCry.java b/Mage.Sets/src/mage/cards/g/GhituWarCry.java index 93a027a9983..295103a7c2d 100644 --- a/Mage.Sets/src/mage/cards/g/GhituWarCry.java +++ b/Mage.Sets/src/mage/cards/g/GhituWarCry.java @@ -27,18 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java b/Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java index f279d565bd9..ba28fbda056 100644 --- a/Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java +++ b/Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GhorClanRampager.java b/Mage.Sets/src/mage/cards/g/GhorClanRampager.java index bdb888e7f55..6b4db033e6d 100644 --- a/Mage.Sets/src/mage/cards/g/GhorClanRampager.java +++ b/Mage.Sets/src/mage/cards/g/GhorClanRampager.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -38,8 +35,11 @@ import mage.abilities.keyword.BloodrushAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GhorClanSavage.java b/Mage.Sets/src/mage/cards/g/GhorClanSavage.java index ac60fbd56d3..4a5be282d0c 100644 --- a/Mage.Sets/src/mage/cards/g/GhorClanSavage.java +++ b/Mage.Sets/src/mage/cards/g/GhorClanSavage.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java b/Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java index cb23934842b..564dd7c6a00 100644 --- a/Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java +++ b/Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,12 +39,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Loki @@ -54,7 +56,7 @@ public class GhostCouncilOfOrzhova extends CardImpl { public GhostCouncilOfOrzhova(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/g/GhostHounds.java b/Mage.Sets/src/mage/cards/g/GhostHounds.java index 5dbef9e482a..ad1d26fece4 100644 --- a/Mage.Sets/src/mage/cards/g/GhostHounds.java +++ b/Mage.Sets/src/mage/cards/g/GhostHounds.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Galatolol diff --git a/Mage.Sets/src/mage/cards/g/GhostLitNourisher.java b/Mage.Sets/src/mage/cards/g/GhostLitNourisher.java index d753b67f01f..3df4397b10e 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitNourisher.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitNourisher.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GhostLitRaider.java b/Mage.Sets/src/mage/cards/g/GhostLitRaider.java index f611a3284e6..ad8dfc8359b 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitRaider.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitRaider.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java b/Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java index 42c78c0881b..5e1891591f4 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitRedeemer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GhostLitStalker.java b/Mage.Sets/src/mage/cards/g/GhostLitStalker.java index 0e5a80b0ea1..98617c2a55a 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitStalker.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitStalker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.TimingRule; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GhostLitWarder.java b/Mage.Sets/src/mage/cards/g/GhostLitWarder.java index 5c7d5b08210..fdeeeb48a11 100644 --- a/Mage.Sets/src/mage/cards/g/GhostLitWarder.java +++ b/Mage.Sets/src/mage/cards/g/GhostLitWarder.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GhostQuarter.java b/Mage.Sets/src/mage/cards/g/GhostQuarter.java index 5b3b7349214..d0aebc0d108 100644 --- a/Mage.Sets/src/mage/cards/g/GhostQuarter.java +++ b/Mage.Sets/src/mage/cards/g/GhostQuarter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GhostShip.java b/Mage.Sets/src/mage/cards/g/GhostShip.java index 1e6e43eaa6f..c14537ffc01 100644 --- a/Mage.Sets/src/mage/cards/g/GhostShip.java +++ b/Mage.Sets/src/mage/cards/g/GhostShip.java @@ -27,18 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author shieldal diff --git a/Mage.Sets/src/mage/cards/g/GhostTactician.java b/Mage.Sets/src/mage/cards/g/GhostTactician.java index b49be28085e..cc609421d49 100644 --- a/Mage.Sets/src/mage/cards/g/GhostTactician.java +++ b/Mage.Sets/src/mage/cards/g/GhostTactician.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GhostTown.java b/Mage.Sets/src/mage/cards/g/GhostTown.java index a3ef00aeb88..29e5488cbf5 100644 --- a/Mage.Sets/src/mage/cards/g/GhostTown.java +++ b/Mage.Sets/src/mage/cards/g/GhostTown.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.MyTurnCondition; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GhostWarden.java b/Mage.Sets/src/mage/cards/g/GhostWarden.java index fe04594ff79..e865490e17e 100644 --- a/Mage.Sets/src/mage/cards/g/GhostWarden.java +++ b/Mage.Sets/src/mage/cards/g/GhostWarden.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +34,13 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java b/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java index 7a9e6927735..de6132b38ec 100644 --- a/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java +++ b/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Ghostfire.java b/Mage.Sets/src/mage/cards/g/Ghostfire.java index e5d4f8ad093..ed14ff9c087 100644 --- a/Mage.Sets/src/mage/cards/g/Ghostfire.java +++ b/Mage.Sets/src/mage/cards/g/Ghostfire.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.InfoEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/g/GhostfireBlade.java b/Mage.Sets/src/mage/cards/g/GhostfireBlade.java index 19c999adf76..f7f64b030cf 100644 --- a/Mage.Sets/src/mage/cards/g/GhostfireBlade.java +++ b/Mage.Sets/src/mage/cards/g/GhostfireBlade.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GhostflameSliver.java b/Mage.Sets/src/mage/cards/g/GhostflameSliver.java index 602f4166e68..d26111b0830 100644 --- a/Mage.Sets/src/mage/cards/g/GhostflameSliver.java +++ b/Mage.Sets/src/mage/cards/g/GhostflameSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -35,16 +34,13 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/g/Ghostform.java b/Mage.Sets/src/mage/cards/g/Ghostform.java index c6eb5066fe1..f64bfa566fb 100644 --- a/Mage.Sets/src/mage/cards/g/Ghostform.java +++ b/Mage.Sets/src/mage/cards/g/Ghostform.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author noxx diff --git a/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java b/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java index 12a396b46e5..3a7750efed6 100644 --- a/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java +++ b/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GhostlyChangeling.java b/Mage.Sets/src/mage/cards/g/GhostlyChangeling.java index 7bbd2ec7007..5dcb09359c0 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyChangeling.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyChangeling.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/cards/g/GhostlyFlicker.java b/Mage.Sets/src/mage/cards/g/GhostlyFlicker.java index f213a2cf409..d663c88ad04 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyFlicker.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyFlicker.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -48,6 +44,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/g/GhostlyPossession.java b/Mage.Sets/src/mage/cards/g/GhostlyPossession.java index 74bd456c31f..d973e6c9bcf 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyPossession.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyPossession.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.PreventionEffectImpl; @@ -39,6 +36,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -46,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/g/GhostlyPrison.java b/Mage.Sets/src/mage/cards/g/GhostlyPrison.java index f2a1e755757..1c3401cc946 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyPrison.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyPrison.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.combat.CantAttackYouUnlessPayManaAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GhostlySentinel.java b/Mage.Sets/src/mage/cards/g/GhostlySentinel.java index d55aa2ba9d3..df708ac1b51 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlySentinel.java +++ b/Mage.Sets/src/mage/cards/g/GhostlySentinel.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GhostlyTouch.java b/Mage.Sets/src/mage/cards/g/GhostlyTouch.java index 99034df175d..31517dcbebc 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyTouch.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyTouch.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -37,6 +36,10 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/g/GhostlyVisit.java b/Mage.Sets/src/mage/cards/g/GhostlyVisit.java index f338a78fffb..6efa27e3ebb 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyVisit.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyVisit.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GhostlyWings.java b/Mage.Sets/src/mage/cards/g/GhostlyWings.java index 83b3490b6cd..5244dc5906a 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyWings.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyWings.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,17 +40,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -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.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java b/Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java index 2f357094b90..8f3f263ab4a 100644 --- a/Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/g/GhostsOfTheDamned.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author hanasu diff --git a/Mage.Sets/src/mage/cards/g/Ghostway.java b/Mage.Sets/src/mage/cards/g/Ghostway.java index 884162fa39d..e407bddd844 100644 --- a/Mage.Sets/src/mage/cards/g/Ghostway.java +++ b/Mage.Sets/src/mage/cards/g/Ghostway.java @@ -27,20 +27,13 @@ */ package mage.cards.g; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -53,6 +46,10 @@ import mage.players.Player; import mage.target.targetpointer.FixedTargets; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java b/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java index 4d9596ff1ce..8d84ca91fba 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -48,6 +48,8 @@ import mage.game.permanent.token.Token; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +64,7 @@ public class GhoulcallerGisa extends CardImpl { public GhoulcallerGisa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallersBell.java b/Mage.Sets/src/mage/cards/g/GhoulcallersBell.java index 695b7b507cd..3b4cdccdf78 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallersBell.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallersBell.java @@ -27,11 +27,6 @@ */ package mage.cards.g; -import java.util.Collection; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,9 +34,15 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.Collection; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java b/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java index dc20e7e8698..f5dfc6d830f 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java @@ -27,17 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/Ghoulflesh.java b/Mage.Sets/src/mage/cards/g/Ghoulflesh.java index 9ce1d07d46f..814eec10e22 100644 --- a/Mage.Sets/src/mage/cards/g/Ghoulflesh.java +++ b/Mage.Sets/src/mage/cards/g/Ghoulflesh.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.*; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/g/Ghoulraiser.java b/Mage.Sets/src/mage/cards/g/Ghoulraiser.java index c1c4a36b084..b1f9fae3658 100644 --- a/Mage.Sets/src/mage/cards/g/Ghoulraiser.java +++ b/Mage.Sets/src/mage/cards/g/Ghoulraiser.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,12 +34,17 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.util.RandomUtil; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GhoulsFeast.java b/Mage.Sets/src/mage/cards/g/GhoulsFeast.java index 2253bf758d7..447b44514da 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulsFeast.java +++ b/Mage.Sets/src/mage/cards/g/GhoulsFeast.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.dynamicvalue.common.StaticValue; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Ghoulsteed.java b/Mage.Sets/src/mage/cards/g/Ghoulsteed.java index 5ad83892500..63ac4dc6262 100644 --- a/Mage.Sets/src/mage/cards/g/Ghoulsteed.java +++ b/Mage.Sets/src/mage/cards/g/Ghoulsteed.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Ghoultree.java b/Mage.Sets/src/mage/cards/g/Ghoultree.java index 57237e31fca..fb259b14af2 100644 --- a/Mage.Sets/src/mage/cards/g/Ghoultree.java +++ b/Mage.Sets/src/mage/cards/g/Ghoultree.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -38,13 +34,14 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CostModificationType; -import mage.constants.Duration; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GiantAdephage.java b/Mage.Sets/src/mage/cards/g/GiantAdephage.java index 813a91faa29..112431ba373 100644 --- a/Mage.Sets/src/mage/cards/g/GiantAdephage.java +++ b/Mage.Sets/src/mage/cards/g/GiantAdephage.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.PutTokenOntoBattlefieldCopySourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiantAmbushBeetle.java b/Mage.Sets/src/mage/cards/g/GiantAmbushBeetle.java index da264682fa9..5e18881844b 100644 --- a/Mage.Sets/src/mage/cards/g/GiantAmbushBeetle.java +++ b/Mage.Sets/src/mage/cards/g/GiantAmbushBeetle.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GiantBadger.java b/Mage.Sets/src/mage/cards/g/GiantBadger.java index 86022c8e4df..551daf2b3dd 100644 --- a/Mage.Sets/src/mage/cards/g/GiantBadger.java +++ b/Mage.Sets/src/mage/cards/g/GiantBadger.java @@ -27,16 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java b/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java index e2fa1fcc0bf..18bf78a4aea 100644 --- a/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java +++ b/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GiantCockroach.java b/Mage.Sets/src/mage/cards/g/GiantCockroach.java index b44df12fa43..366830c4106 100644 --- a/Mage.Sets/src/mage/cards/g/GiantCockroach.java +++ b/Mage.Sets/src/mage/cards/g/GiantCockroach.java @@ -27,11 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GiantCrab.java b/Mage.Sets/src/mage/cards/g/GiantCrab.java index e29dc67a83e..483c17fff14 100644 --- a/Mage.Sets/src/mage/cards/g/GiantCrab.java +++ b/Mage.Sets/src/mage/cards/g/GiantCrab.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -37,6 +34,12 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GiantDustwasp.java b/Mage.Sets/src/mage/cards/g/GiantDustwasp.java index 8c5f2ffc44b..23eddbb0b92 100644 --- a/Mage.Sets/src/mage/cards/g/GiantDustwasp.java +++ b/Mage.Sets/src/mage/cards/g/GiantDustwasp.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SuspendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GiantGrowth.java b/Mage.Sets/src/mage/cards/g/GiantGrowth.java index d3d5c5436da..851a8bb12f6 100644 --- a/Mage.Sets/src/mage/cards/g/GiantGrowth.java +++ b/Mage.Sets/src/mage/cards/g/GiantGrowth.java @@ -28,14 +28,15 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GiantHarbinger.java b/Mage.Sets/src/mage/cards/g/GiantHarbinger.java index e7834ce47a8..5fecc600c32 100644 --- a/Mage.Sets/src/mage/cards/g/GiantHarbinger.java +++ b/Mage.Sets/src/mage/cards/g/GiantHarbinger.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; @@ -38,6 +37,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GiantMantis.java b/Mage.Sets/src/mage/cards/g/GiantMantis.java index 50b5e4d88aa..51a2b17190b 100644 --- a/Mage.Sets/src/mage/cards/g/GiantMantis.java +++ b/Mage.Sets/src/mage/cards/g/GiantMantis.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GiantOctopus.java b/Mage.Sets/src/mage/cards/g/GiantOctopus.java index bf1e2a39e20..1c57707bafd 100644 --- a/Mage.Sets/src/mage/cards/g/GiantOctopus.java +++ b/Mage.Sets/src/mage/cards/g/GiantOctopus.java @@ -27,13 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; - import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GiantScorpion.java b/Mage.Sets/src/mage/cards/g/GiantScorpion.java index 5a29055b38c..d1c759a8246 100644 --- a/Mage.Sets/src/mage/cards/g/GiantScorpion.java +++ b/Mage.Sets/src/mage/cards/g/GiantScorpion.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GiantSolifuge.java b/Mage.Sets/src/mage/cards/g/GiantSolifuge.java index c32ecb6a5bc..4093b281305 100644 --- a/Mage.Sets/src/mage/cards/g/GiantSolifuge.java +++ b/Mage.Sets/src/mage/cards/g/GiantSolifuge.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ShroudAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GiantSpectacle.java b/Mage.Sets/src/mage/cards/g/GiantSpectacle.java index 36206726f7e..5ba3f421911 100644 --- a/Mage.Sets/src/mage/cards/g/GiantSpectacle.java +++ b/Mage.Sets/src/mage/cards/g/GiantSpectacle.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiantSpider.java b/Mage.Sets/src/mage/cards/g/GiantSpider.java index d4b08861dd3..1a9ea9e4327 100644 --- a/Mage.Sets/src/mage/cards/g/GiantSpider.java +++ b/Mage.Sets/src/mage/cards/g/GiantSpider.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GiantStrength.java b/Mage.Sets/src/mage/cards/g/GiantStrength.java index 690b633201d..5b51e05f41f 100644 --- a/Mage.Sets/src/mage/cards/g/GiantStrength.java +++ b/Mage.Sets/src/mage/cards/g/GiantStrength.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -35,10 +34,15 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GiantTortoise.java b/Mage.Sets/src/mage/cards/g/GiantTortoise.java index 88b3d5bffc7..2fe0a8353c8 100644 --- a/Mage.Sets/src/mage/cards/g/GiantTortoise.java +++ b/Mage.Sets/src/mage/cards/g/GiantTortoise.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiantWarthog.java b/Mage.Sets/src/mage/cards/g/GiantWarthog.java index fc9f933b450..b1c0f21dee2 100644 --- a/Mage.Sets/src/mage/cards/g/GiantWarthog.java +++ b/Mage.Sets/src/mage/cards/g/GiantWarthog.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/Giantbaiting.java b/Mage.Sets/src/mage/cards/g/Giantbaiting.java index 6e741d2ccc9..7f679f25487 100644 --- a/Mage.Sets/src/mage/cards/g/Giantbaiting.java +++ b/Mage.Sets/src/mage/cards/g/Giantbaiting.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -41,6 +40,8 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GiantsIre.java b/Mage.Sets/src/mage/cards/g/GiantsIre.java index 838f5d27ebd..83bcffd151b 100644 --- a/Mage.Sets/src/mage/cards/g/GiantsIre.java +++ b/Mage.Sets/src/mage/cards/g/GiantsIre.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -39,6 +38,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GibberingDescent.java b/Mage.Sets/src/mage/cards/g/GibberingDescent.java index a7676a3656f..5136be18c6f 100644 --- a/Mage.Sets/src/mage/cards/g/GibberingDescent.java +++ b/Mage.Sets/src/mage/cards/g/GibberingDescent.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,15 +40,13 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GibberingFiend.java b/Mage.Sets/src/mage/cards/g/GibberingFiend.java index 1cc08becfc9..2274648a5e6 100644 --- a/Mage.Sets/src/mage/cards/g/GibberingFiend.java +++ b/Mage.Sets/src/mage/cards/g/GibberingFiend.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GibberingKami.java b/Mage.Sets/src/mage/cards/g/GibberingKami.java index 6c3fcd08f45..de9b20f030d 100644 --- a/Mage.Sets/src/mage/cards/g/GibberingKami.java +++ b/Mage.Sets/src/mage/cards/g/GibberingKami.java @@ -28,14 +28,14 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java b/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java index b2ac452716d..72cc0109b4f 100644 --- a/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java +++ b/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -48,6 +47,8 @@ import mage.constants.Zone; import mage.game.command.Emblem; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java index dc77aa8fd12..feaa6241ea5 100644 --- a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java +++ b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -53,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GideonJura.java b/Mage.Sets/src/mage/cards/g/GideonJura.java index eb52bb19b0a..e6b50ae6bff 100644 --- a/Mage.Sets/src/mage/cards/g/GideonJura.java +++ b/Mage.Sets/src/mage/cards/g/GideonJura.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -51,6 +50,8 @@ import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GideonsAvenger.java b/Mage.Sets/src/mage/cards/g/GideonsAvenger.java index dff270cbac8..40fd799379a 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsAvenger.java +++ b/Mage.Sets/src/mage/cards/g/GideonsAvenger.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -39,6 +38,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java b/Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java index 0474b752b93..376e879a2f4 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java +++ b/Mage.Sets/src/mage/cards/g/GideonsLawkeeper.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,10 +36,13 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GideonsPhalanx.java b/Mage.Sets/src/mage/cards/g/GideonsPhalanx.java index 3ed8c94bc04..d8d393fa764 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsPhalanx.java +++ b/Mage.Sets/src/mage/cards/g/GideonsPhalanx.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.condition.common.SpellMasteryCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.permanent.token.KnightToken; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GideonsReproach.java b/Mage.Sets/src/mage/cards/g/GideonsReproach.java index 53e441d78c7..0019be3181b 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsReproach.java +++ b/Mage.Sets/src/mage/cards/g/GideonsReproach.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GiftOfEstates.java b/Mage.Sets/src/mage/cards/g/GiftOfEstates.java index be6505862bb..fe0f6b7df5f 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfEstates.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfEstates.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.condition.common.OpponentControlsMoreCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; @@ -39,6 +38,8 @@ import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiftOfImmortality.java b/Mage.Sets/src/mage/cards/g/GiftOfImmortality.java index 2722cd935ac..24c6e7e9f99 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfImmortality.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfImmortality.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -48,6 +47,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java b/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java index cd43fa56195..8aa5d4b07d9 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java @@ -27,12 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,9 +37,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java b/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java index c5d608304bb..228f79064f7 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -50,6 +49,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GiftOfTheGargantuan.java b/Mage.Sets/src/mage/cards/g/GiftOfTheGargantuan.java index 9fdf7f99ebb..22d270f3f17 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfTheGargantuan.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfTheGargantuan.java @@ -27,14 +27,9 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -44,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GiftOfTusks.java b/Mage.Sets/src/mage/cards/g/GiftOfTusks.java index 078dca867d9..c7ee735a5af 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfTusks.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfTusks.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.constants.Duration; import mage.game.permanent.token.ElephantToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GiftedAetherborn.java b/Mage.Sets/src/mage/cards/g/GiftedAetherborn.java index 4703447c619..12a9da04388 100644 --- a/Mage.Sets/src/mage/cards/g/GiftedAetherborn.java +++ b/Mage.Sets/src/mage/cards/g/GiftedAetherborn.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.LifelinkAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GiftedInitiate.java b/Mage.Sets/src/mage/cards/g/GiftedInitiate.java index b7a2a35324d..31105254e3c 100644 --- a/Mage.Sets/src/mage/cards/g/GiftedInitiate.java +++ b/Mage.Sets/src/mage/cards/g/GiftedInitiate.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GiftsUngiven.java b/Mage.Sets/src/mage/cards/g/GiftsUngiven.java index 4b4db14aa8d..7479dfd4aa9 100644 --- a/Mage.Sets/src/mage/cards/g/GiftsUngiven.java +++ b/Mage.Sets/src/mage/cards/g/GiftsUngiven.java @@ -27,14 +27,9 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -45,6 +40,8 @@ import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Gigadrowse.java b/Mage.Sets/src/mage/cards/g/Gigadrowse.java index d554758767c..9025a3adbd2 100644 --- a/Mage.Sets/src/mage/cards/g/Gigadrowse.java +++ b/Mage.Sets/src/mage/cards/g/Gigadrowse.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.ReplicateAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Gigantiform.java b/Mage.Sets/src/mage/cards/g/Gigantiform.java index 68c12f61067..1eff8d75b90 100644 --- a/Mage.Sets/src/mage/cards/g/Gigantiform.java +++ b/Mage.Sets/src/mage/cards/g/Gigantiform.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -44,12 +43,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; @@ -58,6 +52,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/Gigantomancer.java b/Mage.Sets/src/mage/cards/g/Gigantomancer.java index b6b2db03b9d..8264561a539 100644 --- a/Mage.Sets/src/mage/cards/g/Gigantomancer.java +++ b/Mage.Sets/src/mage/cards/g/Gigantomancer.java @@ -28,7 +28,6 @@ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Gigantoplasm.java b/Mage.Sets/src/mage/cards/g/Gigantoplasm.java index 79774188797..8c123ec4ade 100644 --- a/Mage.Sets/src/mage/cards/g/Gigantoplasm.java +++ b/Mage.Sets/src/mage/cards/g/Gigantoplasm.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -50,6 +49,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.functions.ApplyToPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Gigapede.java b/Mage.Sets/src/mage/cards/g/Gigapede.java index 3d9c841cbb1..5c56bdeb92b 100644 --- a/Mage.Sets/src/mage/cards/g/Gigapede.java +++ b/Mage.Sets/src/mage/cards/g/Gigapede.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/Gild.java b/Mage.Sets/src/mage/cards/g/Gild.java index cd72e91447e..60ed6c857de 100644 --- a/Mage.Sets/src/mage/cards/g/Gild.java +++ b/Mage.Sets/src/mage/cards/g/Gild.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.game.permanent.token.GoldToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GildedDrake.java b/Mage.Sets/src/mage/cards/g/GildedDrake.java index be6951537f4..a3ef7374733 100644 --- a/Mage.Sets/src/mage/cards/g/GildedDrake.java +++ b/Mage.Sets/src/mage/cards/g/GildedDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GildedLight.java b/Mage.Sets/src/mage/cards/g/GildedLight.java index fed701678de..570e1a40c9f 100644 --- a/Mage.Sets/src/mage/cards/g/GildedLight.java +++ b/Mage.Sets/src/mage/cards/g/GildedLight.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.GainAbilityControllerEffect; import mage.abilities.keyword.CyclingAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GildedLotus.java b/Mage.Sets/src/mage/cards/g/GildedLotus.java index 4b91738ce46..fcf3b2ecb16 100644 --- a/Mage.Sets/src/mage/cards/g/GildedLotus.java +++ b/Mage.Sets/src/mage/cards/g/GildedLotus.java @@ -27,17 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GilderBairn.java b/Mage.Sets/src/mage/cards/g/GilderBairn.java index bab59c1fbd0..a1b59c183e4 100644 --- a/Mage.Sets/src/mage/cards/g/GilderBairn.java +++ b/Mage.Sets/src/mage/cards/g/GilderBairn.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java b/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java index 46ab3358afe..eb80b187741 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -38,6 +34,9 @@ import mage.abilities.effects.common.ClashEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.DeathtouchAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.game.Game; @@ -46,6 +45,8 @@ import mage.game.permanent.token.ElfToken; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java b/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java index c6ce2ca8ff6..9a749314787 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -38,12 +37,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterLandPermanent; @@ -54,6 +48,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafPalace.java b/Mage.Sets/src/mage/cards/g/GiltLeafPalace.java index d46e0ebf515..850c51098ab 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafPalace.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafPalace.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -36,10 +34,13 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafSeer.java b/Mage.Sets/src/mage/cards/g/GiltLeafSeer.java index 4c322a1cb8b..e326f805b19 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafSeer.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafSeer.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +35,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java b/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java index 008982f0668..23c992ad67b 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -44,6 +43,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java b/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java index a8c871dc7c6..0d1184313f2 100644 --- a/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java +++ b/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,14 +38,7 @@ import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffec import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -56,6 +48,8 @@ import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; +import java.util.UUID; + /** * * @author fireshoes @@ -64,7 +58,7 @@ public class GisaAndGeralf extends CardImpl { public GisaAndGeralf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/g/GisasBidding.java b/Mage.Sets/src/mage/cards/g/GisasBidding.java index dc5e1f10a13..9c245bc9ea5 100644 --- a/Mage.Sets/src/mage/cards/g/GisasBidding.java +++ b/Mage.Sets/src/mage/cards/g/GisasBidding.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.MadnessAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/g/GiselaBladeOfGoldnight.java b/Mage.Sets/src/mage/cards/g/GiselaBladeOfGoldnight.java index 7861dc84faf..8b7976f231b 100644 --- a/Mage.Sets/src/mage/cards/g/GiselaBladeOfGoldnight.java +++ b/Mage.Sets/src/mage/cards/g/GiselaBladeOfGoldnight.java @@ -37,10 +37,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -53,7 +50,7 @@ public class GiselaBladeOfGoldnight extends CardImpl { public GiselaBladeOfGoldnight(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/g/GiselaTheBrokenBlade.java b/Mage.Sets/src/mage/cards/g/GiselaTheBrokenBlade.java index 7bcd5455f17..0033c27ebc8 100644 --- a/Mage.Sets/src/mage/cards/g/GiselaTheBrokenBlade.java +++ b/Mage.Sets/src/mage/cards/g/GiselaTheBrokenBlade.java @@ -40,6 +40,7 @@ import mage.cards.CardSetInfo; import mage.cards.b.BriselaVoiceOfNightmares; import mage.constants.CardType; import mage.constants.Rarity; +import mage.constants.SuperType; import mage.constants.TargetController; import java.util.UUID; @@ -52,7 +53,7 @@ public class GiselaTheBrokenBlade extends CardImpl { public GiselaTheBrokenBlade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.subtype.add("Horror"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/g/GitaxianProbe.java b/Mage.Sets/src/mage/cards/g/GitaxianProbe.java index 8bf19e2dc5b..74ce3e7622a 100644 --- a/Mage.Sets/src/mage/cards/g/GitaxianProbe.java +++ b/Mage.Sets/src/mage/cards/g/GitaxianProbe.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LookAtTargetPlayerHandEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GiveNoGround.java b/Mage.Sets/src/mage/cards/g/GiveNoGround.java index 0cddcd13f38..4e58e428e0d 100644 --- a/Mage.Sets/src/mage/cards/g/GiveNoGround.java +++ b/Mage.Sets/src/mage/cards/g/GiveNoGround.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GiveTake.java b/Mage.Sets/src/mage/cards/g/GiveTake.java index 0d142df0fdf..39caae9cfa7 100644 --- a/Mage.Sets/src/mage/cards/g/GiveTake.java +++ b/Mage.Sets/src/mage/cards/g/GiveTake.java @@ -27,14 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardSetInfo; import mage.cards.SplitCard; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -42,6 +41,8 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlacialChasm.java b/Mage.Sets/src/mage/cards/g/GlacialChasm.java index d08dde2007f..ac995bc0963 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialChasm.java +++ b/Mage.Sets/src/mage/cards/g/GlacialChasm.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.PayLifeCost; @@ -45,6 +44,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java index 2ea779793c9..610779e6d3b 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java b/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java index af8362dfa5d..b15bf4707f4 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GlacialFortress.java b/Mage.Sets/src/mage/cards/g/GlacialFortress.java index 1679ea1698d..129b7d9ee3d 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialFortress.java +++ b/Mage.Sets/src/mage/cards/g/GlacialFortress.java @@ -28,24 +28,24 @@ package mage.cards.g; -import java.util.UUID; - import mage.abilities.CountType; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.InvertCondition; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GlacialRay.java b/Mage.Sets/src/mage/cards/g/GlacialRay.java index 0084b8ea0ee..9791c46b96a 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialRay.java +++ b/Mage.Sets/src/mage/cards/g/GlacialRay.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.SpliceOntoArcaneAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlacialStalker.java b/Mage.Sets/src/mage/cards/g/GlacialStalker.java index 94336d1021f..9a62476cfb5 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialStalker.java +++ b/Mage.Sets/src/mage/cards/g/GlacialStalker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.MorphAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlacialWall.java b/Mage.Sets/src/mage/cards/g/GlacialWall.java index c2eaaab22d9..6ab7d92d094 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialWall.java +++ b/Mage.Sets/src/mage/cards/g/GlacialWall.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GladeGnarr.java b/Mage.Sets/src/mage/cards/g/GladeGnarr.java index ca91dda24a9..5d2afc7cae3 100644 --- a/Mage.Sets/src/mage/cards/g/GladeGnarr.java +++ b/Mage.Sets/src/mage/cards/g/GladeGnarr.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastAllTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GladeWatcher.java b/Mage.Sets/src/mage/cards/g/GladeWatcher.java index 2657406267b..6ea1f8c097e 100644 --- a/Mage.Sets/src/mage/cards/g/GladeWatcher.java +++ b/Mage.Sets/src/mage/cards/g/GladeWatcher.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GladecoverScout.java b/Mage.Sets/src/mage/cards/g/GladecoverScout.java index dafab955c3a..3f66c807c83 100644 --- a/Mage.Sets/src/mage/cards/g/GladecoverScout.java +++ b/Mage.Sets/src/mage/cards/g/GladecoverScout.java @@ -28,13 +28,13 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GladehartCavalry.java b/Mage.Sets/src/mage/cards/g/GladehartCavalry.java index 8335c7afea9..24b1e2ba4ae 100644 --- a/Mage.Sets/src/mage/cards/g/GladehartCavalry.java +++ b/Mage.Sets/src/mage/cards/g/GladehartCavalry.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GlamerSpinners.java b/Mage.Sets/src/mage/cards/g/GlamerSpinners.java index 3f1f3209778..e188cadf1b8 100644 --- a/Mage.Sets/src/mage/cards/g/GlamerSpinners.java +++ b/Mage.Sets/src/mage/cards/g/GlamerSpinners.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.LinkedList; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -50,6 +48,9 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.LinkedList; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GlareOfHeresy.java b/Mage.Sets/src/mage/cards/g/GlareOfHeresy.java index c0b44357a74..50c6db8f509 100644 --- a/Mage.Sets/src/mage/cards/g/GlareOfHeresy.java +++ b/Mage.Sets/src/mage/cards/g/GlareOfHeresy.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java b/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java index 34ab0ff31a5..1b303c013c1 100644 --- a/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java +++ b/Mage.Sets/src/mage/cards/g/GlareOfSubdual.java @@ -27,15 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -45,6 +43,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Glarewielder.java b/Mage.Sets/src/mage/cards/g/Glarewielder.java index 3e368642543..e01862763ca 100644 --- a/Mage.Sets/src/mage/cards/g/Glarewielder.java +++ b/Mage.Sets/src/mage/cards/g/Glarewielder.java @@ -27,20 +27,20 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.combat.CantBlockTargetEffect; -import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.EvokeAbility; +import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlaringAegis.java b/Mage.Sets/src/mage/cards/g/GlaringAegis.java index e0712bd6a9f..1cae035820c 100644 --- a/Mage.Sets/src/mage/cards/g/GlaringAegis.java +++ b/Mage.Sets/src/mage/cards/g/GlaringAegis.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -37,16 +36,14 @@ 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.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java b/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java index 5fe803499ec..17186a5bb3b 100644 --- a/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java +++ b/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java @@ -27,13 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.AsThoughEffectType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,11 +38,14 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * Gatecrash FAQ 21.01.2013 * diff --git a/Mage.Sets/src/mage/cards/g/GlassAsp.java b/Mage.Sets/src/mage/cards/g/GlassAsp.java index f25907f7a47..31a1c53b5fb 100644 --- a/Mage.Sets/src/mage/cards/g/GlassAsp.java +++ b/Mage.Sets/src/mage/cards/g/GlassAsp.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.PhaseStep; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GlassGolem.java b/Mage.Sets/src/mage/cards/g/GlassGolem.java index df9b4da230a..050462b20c6 100644 --- a/Mage.Sets/src/mage/cards/g/GlassGolem.java +++ b/Mage.Sets/src/mage/cards/g/GlassGolem.java @@ -28,11 +28,12 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GlassdustHulk.java b/Mage.Sets/src/mage/cards/g/GlassdustHulk.java index 0236c0e15ac..ae046c39e6d 100644 --- a/Mage.Sets/src/mage/cards/g/GlassdustHulk.java +++ b/Mage.Sets/src/mage/cards/g/GlassdustHulk.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GlassesOfUrza.java b/Mage.Sets/src/mage/cards/g/GlassesOfUrza.java index 653ab186920..fd24fe0e64b 100644 --- a/Mage.Sets/src/mage/cards/g/GlassesOfUrza.java +++ b/Mage.Sets/src/mage/cards/g/GlassesOfUrza.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GlazeFiend.java b/Mage.Sets/src/mage/cards/g/GlazeFiend.java index 69abbddc542..22e9a3347d1 100644 --- a/Mage.Sets/src/mage/cards/g/GlazeFiend.java +++ b/Mage.Sets/src/mage/cards/g/GlazeFiend.java @@ -27,21 +27,21 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java index 8ccd18d5d52..e459cbee0f9 100644 --- a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java +++ b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,11 +42,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -55,6 +50,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GleamOfBattle.java b/Mage.Sets/src/mage/cards/g/GleamOfBattle.java index 2b0b6ed5f9a..fc68093182a 100644 --- a/Mage.Sets/src/mage/cards/g/GleamOfBattle.java +++ b/Mage.Sets/src/mage/cards/g/GleamOfBattle.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GleamOfResistance.java b/Mage.Sets/src/mage/cards/g/GleamOfResistance.java index f4ece3bae96..4e3a7063735 100644 --- a/Mage.Sets/src/mage/cards/g/GleamOfResistance.java +++ b/Mage.Sets/src/mage/cards/g/GleamOfResistance.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Gleancrawler.java b/Mage.Sets/src/mage/cards/g/Gleancrawler.java index afe336499df..5a4e0c3d80f 100644 --- a/Mage.Sets/src/mage/cards/g/Gleancrawler.java +++ b/Mage.Sets/src/mage/cards/g/Gleancrawler.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -37,11 +35,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.InfoEffect; import mage.abilities.keyword.TrampleAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -50,6 +44,9 @@ import mage.game.Game; import mage.players.Player; import mage.watchers.common.CardsPutIntoGraveyardWatcher; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GleefulSabotage.java b/Mage.Sets/src/mage/cards/g/GleefulSabotage.java index ffb579e63b6..f1c5d0fa1ef 100644 --- a/Mage.Sets/src/mage/cards/g/GleefulSabotage.java +++ b/Mage.Sets/src/mage/cards/g/GleefulSabotage.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.ConspireAbility; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java b/Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java index ee1367f1598..f0d36fb1549 100644 --- a/Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java +++ b/Mage.Sets/src/mage/cards/g/GlenElendraArchmage.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,12 +37,15 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java b/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java index c655b00f65f..110524fcf1f 100644 --- a/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java +++ b/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -38,9 +34,14 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GlidingLicid.java b/Mage.Sets/src/mage/cards/g/GlidingLicid.java index 0619a12975c..c6a918a4811 100644 --- a/Mage.Sets/src/mage/cards/g/GlidingLicid.java +++ b/Mage.Sets/src/mage/cards/g/GlidingLicid.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LicidAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GlimmerOfGenius.java b/Mage.Sets/src/mage/cards/g/GlimmerOfGenius.java index c1a4b36e012..f46b6f4cc4f 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerOfGenius.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerOfGenius.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java index cb1af3a7c8e..8eef2800bea 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java @@ -27,21 +27,22 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GlimmeringAngel.java b/Mage.Sets/src/mage/cards/g/GlimmeringAngel.java index 56612281bb3..c7f460b4869 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmeringAngel.java +++ b/Mage.Sets/src/mage/cards/g/GlimmeringAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java b/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java index b43a8c46cbb..3ae8daab26f 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -49,6 +48,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/g/Glimmerpost.java b/Mage.Sets/src/mage/cards/g/Glimmerpost.java index 2d1b7e145f2..00d34eb6321 100644 --- a/Mage.Sets/src/mage/cards/g/Glimmerpost.java +++ b/Mage.Sets/src/mage/cards/g/Glimmerpost.java @@ -28,21 +28,21 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Glimmervoid.java b/Mage.Sets/src/mage/cards/g/Glimmervoid.java index 337064a09f3..77a33903152 100644 --- a/Mage.Sets/src/mage/cards/g/Glimmervoid.java +++ b/Mage.Sets/src/mage/cards/g/Glimmervoid.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.TriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; @@ -42,6 +40,8 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledArtifactPermanent; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GlimpseOfNature.java b/Mage.Sets/src/mage/cards/g/GlimpseOfNature.java index c07e0b3ca4a..22d51adfcea 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseOfNature.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseOfNature.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -42,6 +41,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; +import java.util.UUID; + public class GlimpseOfNature extends CardImpl { public GlimpseOfNature (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java b/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java index 73ce9ae8a43..a57e352cf7e 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java @@ -27,14 +27,9 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -43,6 +38,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java b/Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java index cefdfdff6b0..82a19d1bcee 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java @@ -27,11 +27,10 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.TapTargetEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -39,6 +38,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Glint.java b/Mage.Sets/src/mage/cards/g/Glint.java index ea5b7e47303..f7c5b221227 100644 --- a/Mage.Sets/src/mage/cards/g/Glint.java +++ b/Mage.Sets/src/mage/cards/g/Glint.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GlintEyeNephilim.java b/Mage.Sets/src/mage/cards/g/GlintEyeNephilim.java index 29d9b317ed5..6758fa92630 100644 --- a/Mage.Sets/src/mage/cards/g/GlintEyeNephilim.java +++ b/Mage.Sets/src/mage/cards/g/GlintEyeNephilim.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * @author fenhl */ diff --git a/Mage.Sets/src/mage/cards/g/GlintHawk.java b/Mage.Sets/src/mage/cards/g/GlintHawk.java index 36fc5e4bec0..dfb3e44bc74 100644 --- a/Mage.Sets/src/mage/cards/g/GlintHawk.java +++ b/Mage.Sets/src/mage/cards/g/GlintHawk.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com diff --git a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java index ee3bacdcb52..de3fe9d97fc 100644 --- a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java +++ b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java @@ -28,12 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,13 +36,15 @@ import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.ColoredManaSymbol; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GlintNestCrane.java b/Mage.Sets/src/mage/cards/g/GlintNestCrane.java index 4261ffcaf2c..a2be6cba275 100644 --- a/Mage.Sets/src/mage/cards/g/GlintNestCrane.java +++ b/Mage.Sets/src/mage/cards/g/GlintNestCrane.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GlintSleeveArtisan.java b/Mage.Sets/src/mage/cards/g/GlintSleeveArtisan.java index c82f28a8e2f..d3d302049fd 100644 --- a/Mage.Sets/src/mage/cards/g/GlintSleeveArtisan.java +++ b/Mage.Sets/src/mage/cards/g/GlintSleeveArtisan.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FabricateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GlintSleeveSiphoner.java b/Mage.Sets/src/mage/cards/g/GlintSleeveSiphoner.java index 8b1d885e022..70842746386 100644 --- a/Mage.Sets/src/mage/cards/g/GlintSleeveSiphoner.java +++ b/Mage.Sets/src/mage/cards/g/GlintSleeveSiphoner.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GlintwingInvoker.java b/Mage.Sets/src/mage/cards/g/GlintwingInvoker.java index de5259cfa34..6209de5630b 100644 --- a/Mage.Sets/src/mage/cards/g/GlintwingInvoker.java +++ b/Mage.Sets/src/mage/cards/g/GlintwingInvoker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java b/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java index 47e037cc615..5d4ccc8c487 100644 --- a/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java +++ b/Mage.Sets/src/mage/cards/g/GlissaSunseeker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -45,6 +45,8 @@ import mage.players.ManaPool; import mage.players.Player; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -53,7 +55,7 @@ public class GlissaSunseeker extends CardImpl { public GlissaSunseeker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/g/GlissaTheTraitor.java b/Mage.Sets/src/mage/cards/g/GlissaTheTraitor.java index 9903b42dc86..1413989c063 100644 --- a/Mage.Sets/src/mage/cards/g/GlissaTheTraitor.java +++ b/Mage.Sets/src/mage/cards/g/GlissaTheTraitor.java @@ -28,7 +28,6 @@ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; @@ -37,6 +36,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -47,6 +47,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki @@ -54,7 +56,7 @@ import mage.target.common.TargetCardInYourGraveyard; public class GlissaTheTraitor extends CardImpl { public GlissaTheTraitor (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Elf"); diff --git a/Mage.Sets/src/mage/cards/g/GlissasCourier.java b/Mage.Sets/src/mage/cards/g/GlissasCourier.java index 69897c92b23..bce6b3aef56 100644 --- a/Mage.Sets/src/mage/cards/g/GlissasCourier.java +++ b/Mage.Sets/src/mage/cards/g/GlissasCourier.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GlissasScorn.java b/Mage.Sets/src/mage/cards/g/GlissasScorn.java index 463f08efeb4..bdaacebfaa7 100644 --- a/Mage.Sets/src/mage/cards/g/GlissasScorn.java +++ b/Mage.Sets/src/mage/cards/g/GlissasScorn.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LoseLifeTargetControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GlistenerElf.java b/Mage.Sets/src/mage/cards/g/GlistenerElf.java index 4f24eba4a4a..5651b6d73ab 100644 --- a/Mage.Sets/src/mage/cards/g/GlistenerElf.java +++ b/Mage.Sets/src/mage/cards/g/GlistenerElf.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GlisteningOil.java b/Mage.Sets/src/mage/cards/g/GlisteningOil.java index 1c5d0e20aae..b3e5e7fb62c 100644 --- a/Mage.Sets/src/mage/cards/g/GlisteningOil.java +++ b/Mage.Sets/src/mage/cards/g/GlisteningOil.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; @@ -42,12 +39,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Glitterfang.java b/Mage.Sets/src/mage/cards/g/Glitterfang.java index 029dc6208be..27c4a6c63fd 100644 --- a/Mage.Sets/src/mage/cards/g/Glitterfang.java +++ b/Mage.Sets/src/mage/cards/g/Glitterfang.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GlitteringWish.java b/Mage.Sets/src/mage/cards/g/GlitteringWish.java index 509635970ac..baa55786109 100644 --- a/Mage.Sets/src/mage/cards/g/GlitteringWish.java +++ b/Mage.Sets/src/mage/cards/g/GlitteringWish.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.WishEffect; import mage.cards.CardImpl; @@ -36,6 +35,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.MulticoloredPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GlobalRuin.java b/Mage.Sets/src/mage/cards/g/GlobalRuin.java index ebaecb60bd8..5475b9bb288 100644 --- a/Mage.Sets/src/mage/cards/g/GlobalRuin.java +++ b/Mage.Sets/src/mage/cards/g/GlobalRuin.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -45,6 +42,10 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author Markedagain diff --git a/Mage.Sets/src/mage/cards/g/Gloom.java b/Mage.Sets/src/mage/cards/g/Gloom.java index c17e812073d..2832c5508fa 100644 --- a/Mage.Sets/src/mage/cards/g/Gloom.java +++ b/Mage.Sets/src/mage/cards/g/Gloom.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; @@ -36,17 +35,14 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.effects.common.cost.SpellsCostIncreasementAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityType; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/GloomSurgeon.java b/Mage.Sets/src/mage/cards/g/GloomSurgeon.java index e6550f29d25..3bb9dbdee25 100644 --- a/Mage.Sets/src/mage/cards/g/GloomSurgeon.java +++ b/Mage.Sets/src/mage/cards/g/GloomSurgeon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.game.events.DamageCreatureEvent; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** * @author noxx */ diff --git a/Mage.Sets/src/mage/cards/g/Gloomdrifter.java b/Mage.Sets/src/mage/cards/g/Gloomdrifter.java index 4bf7fdccbe7..56f554930de 100644 --- a/Mage.Sets/src/mage/cards/g/Gloomdrifter.java +++ b/Mage.Sets/src/mage/cards/g/Gloomdrifter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -48,6 +47,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/Gloomhunter.java b/Mage.Sets/src/mage/cards/g/Gloomhunter.java index 37975a8bdaf..f0ac0bc7869 100644 --- a/Mage.Sets/src/mage/cards/g/Gloomhunter.java +++ b/Mage.Sets/src/mage/cards/g/Gloomhunter.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/Gloomlance.java b/Mage.Sets/src/mage/cards/g/Gloomlance.java index 1504b75a682..28fefc10d9b 100644 --- a/Mage.Sets/src/mage/cards/g/Gloomlance.java +++ b/Mage.Sets/src/mage/cards/g/Gloomlance.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/Gloomwidow.java b/Mage.Sets/src/mage/cards/g/Gloomwidow.java index 12dc2d702a1..fabb0774e04 100644 --- a/Mage.Sets/src/mage/cards/g/Gloomwidow.java +++ b/Mage.Sets/src/mage/cards/g/Gloomwidow.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.ReachAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GloomwidowsFeast.java b/Mage.Sets/src/mage/cards/g/GloomwidowsFeast.java index 11cdf6a9dc7..c4af3683f41 100644 --- a/Mage.Sets/src/mage/cards/g/GloomwidowsFeast.java +++ b/Mage.Sets/src/mage/cards/g/GloomwidowsFeast.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; @@ -42,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.SpiderToken; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GloriousAnthem.java b/Mage.Sets/src/mage/cards/g/GloriousAnthem.java index 02cd430399d..3c839379629 100644 --- a/Mage.Sets/src/mage/cards/g/GloriousAnthem.java +++ b/Mage.Sets/src/mage/cards/g/GloriousAnthem.java @@ -27,17 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GloriousCharge.java b/Mage.Sets/src/mage/cards/g/GloriousCharge.java index 551f8dfb512..11df001fd5e 100644 --- a/Mage.Sets/src/mage/cards/g/GloriousCharge.java +++ b/Mage.Sets/src/mage/cards/g/GloriousCharge.java @@ -27,15 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Glory.java b/Mage.Sets/src/mage/cards/g/Glory.java index 6419d72adc4..442bb111713 100644 --- a/Mage.Sets/src/mage/cards/g/Glory.java +++ b/Mage.Sets/src/mage/cards/g/Glory.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java b/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java index 54375c13c7c..fea3d86f07a 100644 --- a/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java +++ b/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java @@ -28,11 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.condition.common.NotMyTurnCondition; @@ -40,6 +35,11 @@ import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GlorySeeker.java b/Mage.Sets/src/mage/cards/g/GlorySeeker.java index fd4efb8028b..1bec3bd1188 100644 --- a/Mage.Sets/src/mage/cards/g/GlorySeeker.java +++ b/Mage.Sets/src/mage/cards/g/GlorySeeker.java @@ -28,11 +28,12 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GloryscaleViashino.java b/Mage.Sets/src/mage/cards/g/GloryscaleViashino.java index d186df38e91..e2ca85a26ea 100644 --- a/Mage.Sets/src/mage/cards/g/GloryscaleViashino.java +++ b/Mage.Sets/src/mage/cards/g/GloryscaleViashino.java @@ -28,7 +28,6 @@ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GloweringRogon.java b/Mage.Sets/src/mage/cards/g/GloweringRogon.java index 42373913e13..cd40eca33f0 100644 --- a/Mage.Sets/src/mage/cards/g/GloweringRogon.java +++ b/Mage.Sets/src/mage/cards/g/GloweringRogon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.AmplifyEffect; import mage.abilities.keyword.AmplifyAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/Glowrider.java b/Mage.Sets/src/mage/cards/g/Glowrider.java index be7abb0d0a4..e07ebfbbe52 100644 --- a/Mage.Sets/src/mage/cards/g/Glowrider.java +++ b/Mage.Sets/src/mage/cards/g/Glowrider.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -37,14 +36,12 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GluttonousCyclops.java b/Mage.Sets/src/mage/cards/g/GluttonousCyclops.java index 3f69e793b96..6d8f79ac195 100644 --- a/Mage.Sets/src/mage/cards/g/GluttonousCyclops.java +++ b/Mage.Sets/src/mage/cards/g/GluttonousCyclops.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.MonstrosityAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GluttonousSlime.java b/Mage.Sets/src/mage/cards/g/GluttonousSlime.java index dcf6cdf219c..af68dbe9ac5 100644 --- a/Mage.Sets/src/mage/cards/g/GluttonousSlime.java +++ b/Mage.Sets/src/mage/cards/g/GluttonousSlime.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.effects.common.DevourEffect.DevourFactor; import mage.abilities.keyword.DevourAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GluttonousZombie.java b/Mage.Sets/src/mage/cards/g/GluttonousZombie.java index 25d928967a4..2e82782c1e1 100644 --- a/Mage.Sets/src/mage/cards/g/GluttonousZombie.java +++ b/Mage.Sets/src/mage/cards/g/GluttonousZombie.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GnarledEffigy.java b/Mage.Sets/src/mage/cards/g/GnarledEffigy.java index 4adc6d8dd02..29803bb8f00 100644 --- a/Mage.Sets/src/mage/cards/g/GnarledEffigy.java +++ b/Mage.Sets/src/mage/cards/g/GnarledEffigy.java @@ -27,18 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GnarledMass.java b/Mage.Sets/src/mage/cards/g/GnarledMass.java index aeb0b60e414..7b541b5b2a0 100644 --- a/Mage.Sets/src/mage/cards/g/GnarledMass.java +++ b/Mage.Sets/src/mage/cards/g/GnarledMass.java @@ -27,11 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GnarledScarhide.java b/Mage.Sets/src/mage/cards/g/GnarledScarhide.java index 9a16eee3ecf..b2746aaa00c 100644 --- a/Mage.Sets/src/mage/cards/g/GnarledScarhide.java +++ b/Mage.Sets/src/mage/cards/g/GnarledScarhide.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GnarlidPack.java b/Mage.Sets/src/mage/cards/g/GnarlidPack.java index d355092daa4..f3a6a6efe75 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlidPack.java +++ b/Mage.Sets/src/mage/cards/g/GnarlidPack.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; @@ -36,8 +34,11 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java index 0f133884803..ca8f9e2c2c7 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java +++ b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ConditionalMana; import mage.MageInt; import mage.MageObject; @@ -53,6 +52,8 @@ import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java b/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java index 28b6619c963..4c5f3405a77 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java +++ b/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GnatAlleyCreeper.java b/Mage.Sets/src/mage/cards/g/GnatAlleyCreeper.java index 50d340c11ef..b19cf6bae14 100644 --- a/Mage.Sets/src/mage/cards/g/GnatAlleyCreeper.java +++ b/Mage.Sets/src/mage/cards/g/GnatAlleyCreeper.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GnatMiser.java b/Mage.Sets/src/mage/cards/g/GnatMiser.java index a06a64e2c8f..af7e91141ce 100644 --- a/Mage.Sets/src/mage/cards/g/GnatMiser.java +++ b/Mage.Sets/src/mage/cards/g/GnatMiser.java @@ -27,20 +27,21 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect.HandSizeModification; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Gnathosaur.java b/Mage.Sets/src/mage/cards/g/Gnathosaur.java index 1666d49241a..185afc84a63 100644 --- a/Mage.Sets/src/mage/cards/g/Gnathosaur.java +++ b/Mage.Sets/src/mage/cards/g/Gnathosaur.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,12 +34,15 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GnawToTheBone.java b/Mage.Sets/src/mage/cards/g/GnawToTheBone.java index d269233ad9e..7d722b924ae 100644 --- a/Mage.Sets/src/mage/cards/g/GnawToTheBone.java +++ b/Mage.Sets/src/mage/cards/g/GnawToTheBone.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; @@ -37,9 +34,12 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/g/GnawingZombie.java b/Mage.Sets/src/mage/cards/g/GnawingZombie.java index a43b14afe29..415b0fdde07 100644 --- a/Mage.Sets/src/mage/cards/g/GnawingZombie.java +++ b/Mage.Sets/src/mage/cards/g/GnawingZombie.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoForTheThroat.java b/Mage.Sets/src/mage/cards/g/GoForTheThroat.java index 574a1a04eec..109bc95a80c 100644 --- a/Mage.Sets/src/mage/cards/g/GoForTheThroat.java +++ b/Mage.Sets/src/mage/cards/g/GoForTheThroat.java @@ -27,17 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Goatnapper.java b/Mage.Sets/src/mage/cards/g/Goatnapper.java index 508ea5e38b5..735cb808155 100644 --- a/Mage.Sets/src/mage/cards/g/Goatnapper.java +++ b/Mage.Sets/src/mage/cards/g/Goatnapper.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/cards/g/GobblingOoze.java b/Mage.Sets/src/mage/cards/g/GobblingOoze.java index 55e7e492e70..3609400edbc 100644 --- a/Mage.Sets/src/mage/cards/g/GobblingOoze.java +++ b/Mage.Sets/src/mage/cards/g/GobblingOoze.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +35,15 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GobhobblerRats.java b/Mage.Sets/src/mage/cards/g/GobhobblerRats.java index 77333a1ba06..0c133b6e86a 100644 --- a/Mage.Sets/src/mage/cards/g/GobhobblerRats.java +++ b/Mage.Sets/src/mage/cards/g/GobhobblerRats.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java b/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java index 9ed3358eedb..7602a90c294 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java @@ -5,7 +5,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -23,6 +22,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/g/GoblinArsonist.java b/Mage.Sets/src/mage/cards/g/GoblinArsonist.java index cb60c8183b1..03be7de0af2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArsonist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArsonist.java @@ -27,16 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GoblinArtillery.java b/Mage.Sets/src/mage/cards/g/GoblinArtillery.java index ed00ab54633..b00f8794abd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArtillery.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArtillery.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoblinArtisans.java b/Mage.Sets/src/mage/cards/g/GoblinArtisans.java index b078845e029..4f4d959aef0 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArtisans.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArtisans.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -54,6 +52,9 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetCard; +import java.util.List; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/g/GoblinAssassin.java b/Mage.Sets/src/mage/cards/g/GoblinAssassin.java index c20506e32f8..4f2f6335d99 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinAssassin.java +++ b/Mage.Sets/src/mage/cards/g/GoblinAssassin.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -46,6 +43,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * @author BursegSardaukar */ diff --git a/Mage.Sets/src/mage/cards/g/GoblinAssault.java b/Mage.Sets/src/mage/cards/g/GoblinAssault.java index d5f0cf4b67c..21bc0d72952 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinAssault.java +++ b/Mage.Sets/src/mage/cards/g/GoblinAssault.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -42,6 +41,8 @@ import mage.filter.StaticFilters; import mage.game.permanent.token.GoblinTokenWithHaste; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java index 426879e00a1..001ffe92428 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBalloonBrigade.java @@ -28,10 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +35,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java index b737295789c..1424e4d5f87 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/g/GoblinBattleJester.java b/Mage.Sets/src/mage/cards/g/GoblinBattleJester.java index f52009d0546..ad785137d25 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBattleJester.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBattleJester.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -37,10 +34,14 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GoblinBerserker.java b/Mage.Sets/src/mage/cards/g/GoblinBerserker.java index dc7aaf800e8..3ef1b492470 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBerserker.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBerserker.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinBomb.java b/Mage.Sets/src/mage/cards/g/GoblinBomb.java index d9120b95124..9cc1ac7bb5f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBomb.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBomb.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinBombardment.java b/Mage.Sets/src/mage/cards/g/GoblinBombardment.java index 08edfd28110..e1f822c5398 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBombardment.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBombardment.java @@ -27,19 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java b/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java index ca4c307cab5..52eb27f7a2d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinBrawler.java b/Mage.Sets/src/mage/cards/g/GoblinBrawler.java index 0e085dee1e0..1196b8e5e0e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBrawler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBrawler.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoblinBrigand.java b/Mage.Sets/src/mage/cards/g/GoblinBrigand.java index 77b17115f76..009aed33076 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBrigand.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBrigand.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Jgod diff --git a/Mage.Sets/src/mage/cards/g/GoblinBully.java b/Mage.Sets/src/mage/cards/g/GoblinBully.java index 2d9acb14b73..0dcb14abbfc 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBully.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBully.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoblinBurrows.java b/Mage.Sets/src/mage/cards/g/GoblinBurrows.java index ebffcceea1d..abdfebcaa0e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBurrows.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBurrows.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinBushwhacker.java b/Mage.Sets/src/mage/cards/g/GoblinBushwhacker.java index 3efb2e8b43f..dc6d2c37911 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBushwhacker.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBushwhacker.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; @@ -40,6 +37,10 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinCadets.java b/Mage.Sets/src/mage/cards/g/GoblinCadets.java index 72b6a494293..ed6181e6967 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCadets.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCadets.java @@ -27,22 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinCannon.java b/Mage.Sets/src/mage/cards/g/GoblinCannon.java index f9d60952a69..b79c2611f17 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCannon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCannon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoblinCavaliers.java b/Mage.Sets/src/mage/cards/g/GoblinCavaliers.java index 504a4a53f6a..d29e4c01f46 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCavaliers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCavaliers.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoblinCaves.java b/Mage.Sets/src/mage/cards/g/GoblinCaves.java index 56507925d8c..bf89fbcecad 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCaves.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCaves.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; @@ -48,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author nigelzor @@ -89,7 +89,7 @@ class AttachedToBasicMountainCondition implements Condition { if (enchantment != null) { Permanent enchanted = game.getPermanent(enchantment.getAttachedTo()); if (enchanted != null) { - if (enchanted.hasSubtype("Mountain", game) && enchanted.getSupertype().contains("Basic")) { + if (enchanted.hasSubtype("Mountain", game) && enchanted.isBasic()) { return true; } } diff --git a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java index 979c304f904..eee0d432a79 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java @@ -27,18 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -47,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoblinChariot.java b/Mage.Sets/src/mage/cards/g/GoblinChariot.java index 2e301f112b9..e5fb989a487 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChariot.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChariot.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinChieftain.java b/Mage.Sets/src/mage/cards/g/GoblinChieftain.java index 2b15368cdff..2d355e375e2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChieftain.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChieftain.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java b/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java index aec0d39dc7c..d007e0428d5 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinClearcutter.java b/Mage.Sets/src/mage/cards/g/GoblinClearcutter.java index 56f52468add..ecf54069cfd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinClearcutter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinClearcutter.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -50,6 +47,10 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + /** * @author BursegSardaukar */ diff --git a/Mage.Sets/src/mage/cards/g/GoblinCohort.java b/Mage.Sets/src/mage/cards/g/GoblinCohort.java index 7dc7628b1c5..4525bfd6ba1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCohort.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCohort.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.watchers.common.PlayerCastCreatureWatcher; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinCommando.java b/Mage.Sets/src/mage/cards/g/GoblinCommando.java index 6028ccc9dfb..545afb12cab 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCommando.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCommando.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinDarkDwellers.java b/Mage.Sets/src/mage/cards/g/GoblinDarkDwellers.java index bd4243485f1..3309019010a 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDarkDwellers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDarkDwellers.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -52,6 +51,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinDeathraiders.java b/Mage.Sets/src/mage/cards/g/GoblinDeathraiders.java index 20916b7d2dc..f49b0379485 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDeathraiders.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDeathraiders.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java b/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java index d7f1353235f..f7946b2e541 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java b/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java index e9f16f655de..87e52636870 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GoblinDirigible.java b/Mage.Sets/src/mage/cards/g/GoblinDirigible.java index e676c1a9495..a3aae730851 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDirigible.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDirigible.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java index f7b047658dd..a519bb73d5e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * @author BursegSardaukar */ diff --git a/Mage.Sets/src/mage/cards/g/GoblinElectromancer.java b/Mage.Sets/src/mage/cards/g/GoblinElectromancer.java index dd012c962a6..ae3f4a1ebcd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinElectromancer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinElectromancer.java @@ -27,19 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinEliteInfantry.java b/Mage.Sets/src/mage/cards/g/GoblinEliteInfantry.java index dfb49b71f61..f769c767e7b 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinEliteInfantry.java +++ b/Mage.Sets/src/mage/cards/g/GoblinEliteInfantry.java @@ -27,16 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java b/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java index 4a845b5cfaa..ce5b8cf14a7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,9 +36,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/g/GoblinFirebug.java b/Mage.Sets/src/mage/cards/g/GoblinFirebug.java index 520cc63a6cb..752cc5e2da2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFirebug.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFirebug.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.common.SacrificeControllerEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinFireslinger.java b/Mage.Sets/src/mage/cards/g/GoblinFireslinger.java index 0a99d2712f8..fb1a1b13b82 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFireslinger.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFireslinger.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,12 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java b/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java index b2309a3754d..f63e5e1b9da 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java b/Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java index e8c7b47edc0..17cd89e973b 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFlectomancer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterInstantOrSorcerySpell; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GoblinFlotilla.java b/Mage.Sets/src/mage/cards/g/GoblinFlotilla.java index 708cff45934..75d34c709ae 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFlotilla.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFlotilla.java @@ -27,11 +27,11 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.DoUnlessControllerPaysEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -41,7 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; -import mage.abilities.effects.common.DoUnlessControllerPaysEffect; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinFreerunner.java b/Mage.Sets/src/mage/cards/g/GoblinFreerunner.java index 729c0325141..88ebfae47e3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFreerunner.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFreerunner.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.MenaceAbility; import mage.abilities.keyword.SurgeAbility; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinGardener.java b/Mage.Sets/src/mage/cards/g/GoblinGardener.java index 0885514f8da..5245a3a7b95 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGardener.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGardener.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java b/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java index e208a693868..83276b92dcb 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.EquipmentAttachedCount; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GoblinGeneral.java b/Mage.Sets/src/mage/cards/g/GoblinGeneral.java index 1dd8687f41b..12e8dddd550 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGeneral.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGeneral.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinGlider.java b/Mage.Sets/src/mage/cards/g/GoblinGlider.java index c60e2354f78..20a9f992bf4 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGlider.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGlider.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java b/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java index 18891f770b7..23fef684345 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinGoon.java b/Mage.Sets/src/mage/cards/g/GoblinGoon.java index 4f077ebd6c8..73c6a915301 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGoon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGoon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GoblinGrappler.java b/Mage.Sets/src/mage/cards/g/GoblinGrappler.java index 51715f4b530..cffe0615710 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGrappler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGrappler.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.ProvokeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinGrenade.java b/Mage.Sets/src/mage/cards/g/GoblinGrenade.java index 1c0a900a253..fea70d4cc7c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGrenade.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGrenade.java @@ -27,18 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GoblinGrenadiers.java b/Mage.Sets/src/mage/cards/g/GoblinGrenadiers.java index 9f3e699093c..476c4985410 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGrenadiers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGrenadiers.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GoblinGuide.java b/Mage.Sets/src/mage/cards/g/GoblinGuide.java index ed74629a5d1..2d1163e9352 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGuide.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -35,11 +34,7 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.HasteAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -49,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java b/Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java index 90e3d7c92e0..672ca32d0dd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinHero.java b/Mage.Sets/src/mage/cards/g/GoblinHero.java index 907186b616b..ab219d87ab7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinHero.java +++ b/Mage.Sets/src/mage/cards/g/GoblinHero.java @@ -27,11 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java b/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java index cd02229e5be..7529a2d93d9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -53,6 +52,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GoblinKing.java b/Mage.Sets/src/mage/cards/g/GoblinKing.java index cf366241012..bdfc1402b0a 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKing.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKing.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GoblinKites.java b/Mage.Sets/src/mage/cards/g/GoblinKites.java index cb5fffb4115..3e3d6415bb6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKites.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKites.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +37,7 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -52,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/g/GoblinLackey.java b/Mage.Sets/src/mage/cards/g/GoblinLackey.java index 2e7c5dd9436..dbb5c750326 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLackey.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLackey.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java b/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java index 3e9a4acb21c..cb2bd644ce7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,14 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoblinLookout.java b/Mage.Sets/src/mage/cards/g/GoblinLookout.java index 35f502df0ee..f1cb074f855 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLookout.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLookout.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinLore.java b/Mage.Sets/src/mage/cards/g/GoblinLore.java index 8666479c5c7..2a22ae3117c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLore.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLore.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinMarshal.java b/Mage.Sets/src/mage/cards/g/GoblinMarshal.java index 7af33b214c1..f7ca993545b 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMarshal.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMarshal.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldOrDiesSourceTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.GoblinToken; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/g/GoblinMasons.java b/Mage.Sets/src/mage/cards/g/GoblinMasons.java index 7e4e04f6da7..cec4aca2c10 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMasons.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMasons.java @@ -27,18 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/g/GoblinMatron.java b/Mage.Sets/src/mage/cards/g/GoblinMatron.java index d9f1262cecf..1284b4f7290 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMatron.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMatron.java @@ -27,17 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GoblinMedics.java b/Mage.Sets/src/mage/cards/g/GoblinMedics.java index 440935255b5..892c7d1678c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMedics.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMedics.java @@ -27,16 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoblinMountaineer.java b/Mage.Sets/src/mage/cards/g/GoblinMountaineer.java index d176fe7349a..83235340bf3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMountaineer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMountaineer.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinMutant.java b/Mage.Sets/src/mage/cards/g/GoblinMutant.java index 64344be68f9..8e0f8ea5baf 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMutant.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMutant.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -44,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.permanent.TappedPredicate; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/g/GoblinOffensive.java b/Mage.Sets/src/mage/cards/g/GoblinOffensive.java index e7b780603d2..28f6a5503fb 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinOffensive.java +++ b/Mage.Sets/src/mage/cards/g/GoblinOffensive.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.GoblinToken; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GoblinOutlander.java b/Mage.Sets/src/mage/cards/g/GoblinOutlander.java index 823aa4057be..f115f8c5ab9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinOutlander.java +++ b/Mage.Sets/src/mage/cards/g/GoblinOutlander.java @@ -28,13 +28,14 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinPatrol.java b/Mage.Sets/src/mage/cards/g/GoblinPatrol.java index 6259cb0815e..30f788787d4 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPatrol.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPatrol.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinPiker.java b/Mage.Sets/src/mage/cards/g/GoblinPiker.java index eada94914ad..e7152baaf67 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPiker.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPiker.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java b/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java index 9b82c30f7da..955096f50b8 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.AttacksTriggeredAbility; @@ -39,10 +36,14 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java b/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java index 5e407d38791..4055ca5036f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java index 28518ccddfd..e6175a3e846 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -51,6 +50,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.GoblinTokenWithHaste; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GoblinRaider.java b/Mage.Sets/src/mage/cards/g/GoblinRaider.java index ca467840f0a..02492372e86 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRaider.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRaider.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinRally.java b/Mage.Sets/src/mage/cards/g/GoblinRally.java index b23c810c4cd..159e30b34c2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRally.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRally.java @@ -28,13 +28,14 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.GoblinToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java b/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java index 4c417750d03..c1d7a1941af 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; @@ -42,12 +39,16 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoblinRecruiter.java b/Mage.Sets/src/mage/cards/g/GoblinRecruiter.java index 37c51803cc4..460f961332b 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRecruiter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRecruiter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.RecruiterEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinReplica.java b/Mage.Sets/src/mage/cards/g/GoblinReplica.java index 772a90989f2..d41bf871160 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinReplica.java +++ b/Mage.Sets/src/mage/cards/g/GoblinReplica.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +35,14 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoblinRingleader.java b/Mage.Sets/src/mage/cards/g/GoblinRingleader.java index 2aacef8b84a..1debf06e57d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRingleader.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRingleader.java @@ -27,18 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoblinRoughrider.java b/Mage.Sets/src/mage/cards/g/GoblinRoughrider.java index f42afa77e50..9e3e5eb3247 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRoughrider.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRoughrider.java @@ -28,11 +28,12 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinRuinblaster.java b/Mage.Sets/src/mage/cards/g/GoblinRuinblaster.java index 51577ae0e7a..fe39531e71c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRuinblaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRuinblaster.java @@ -28,8 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; @@ -39,8 +37,11 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GoblinScouts.java b/Mage.Sets/src/mage/cards/g/GoblinScouts.java index 10d211d874f..a7ae2193a7a 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinScouts.java +++ b/Mage.Sets/src/mage/cards/g/GoblinScouts.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.MountainwalkAbility; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinSettler.java b/Mage.Sets/src/mage/cards/g/GoblinSettler.java index 529915b2bbb..84c77cb9b6f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSettler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSettler.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java index be0b58f31eb..a1fde14334f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -41,8 +38,12 @@ import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GoblinShortcutter.java b/Mage.Sets/src/mage/cards/g/GoblinShortcutter.java index 07476230417..738f73bb814 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinShortcutter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinShortcutter.java @@ -27,17 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GoblinSkyRaider.java b/Mage.Sets/src/mage/cards/g/GoblinSkyRaider.java index 4a615458c67..d13d6c12a82 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSkyRaider.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSkyRaider.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinSkycutter.java b/Mage.Sets/src/mage/cards/g/GoblinSkycutter.java index c43f5b17d78..c22ab02c377 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSkycutter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSkycutter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GoblinSledder.java b/Mage.Sets/src/mage/cards/g/GoblinSledder.java index 86de895fc42..7eefefc36e1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSledder.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSledder.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinSnowman.java b/Mage.Sets/src/mage/cards/g/GoblinSnowman.java index 3e24c11aeb2..a078c021b74 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSnowman.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSnowman.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksTriggeredAbility; @@ -46,6 +45,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.permanent.BlockedByIdPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java b/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java index 3b380c74e90..c408810cb66 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/g/GoblinSpelunkers.java b/Mage.Sets/src/mage/cards/g/GoblinSpelunkers.java index 10a6ae97dfa..5b4139c9f9a 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSpelunkers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSpelunkers.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinSpy.java b/Mage.Sets/src/mage/cards/g/GoblinSpy.java index a3462e7b6e3..47aed5843d1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSpy.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSpy.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.PlayWithTheTopCardRevealedEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author michael.napoleon@gmail.com diff --git a/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java b/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java index 80b8afcdfe9..fe6e7684863 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -38,17 +37,15 @@ import mage.abilities.effects.common.combat.AttacksIfAbleAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/g/GoblinStriker.java b/Mage.Sets/src/mage/cards/g/GoblinStriker.java index 60814dbb940..0bef44696e1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinStriker.java +++ b/Mage.Sets/src/mage/cards/g/GoblinStriker.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinSwineRider.java b/Mage.Sets/src/mage/cards/g/GoblinSwineRider.java index b2cda8071ad..dda10436c8c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSwineRider.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSwineRider.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java index b7d9c256494..2788de404c8 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java b/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java index f3ec3f7c843..2047197b51d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,13 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java b/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java index 6bd70ac464c..74eff264140 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTinkerer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinTrenches.java b/Mage.Sets/src/mage/cards/g/GoblinTrenches.java index 8fb74ac800e..1c03961eb01 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTrenches.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTrenches.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +35,15 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoblinTunneler.java b/Mage.Sets/src/mage/cards/g/GoblinTunneler.java index 811fa41c08c..cad47acefa2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTunneler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTunneler.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +35,15 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java b/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java index 317056218c6..e18775adbcc 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,11 +34,14 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/g/GoblinVandal.java b/Mage.Sets/src/mage/cards/g/GoblinVandal.java index 4b41cd7c31a..1d6d49e1280 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinVandal.java +++ b/Mage.Sets/src/mage/cards/g/GoblinVandal.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; @@ -51,6 +50,8 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarBuggy.java b/Mage.Sets/src/mage/cards/g/GoblinWarBuggy.java index d4dad590e1c..27ff5e0ce6d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarBuggy.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarBuggy.java @@ -28,13 +28,14 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java index f53fba68300..23086fbaca3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.MenaceAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java b/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java index 8ea6a0d0848..ffcb00d49b2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java @@ -27,25 +27,25 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.continuous.BoostEnchantedEffect; -import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.continuous.BoostEnchantedEffect; +import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java b/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java index ba196b6c87e..5448931a733 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java b/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java index b076fa4e56c..3e58dc9e6c6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarchief.java b/Mage.Sets/src/mage/cards/g/GoblinWarchief.java index eb691c9d4ce..33d442beb6d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarchief.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarchief.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -38,10 +34,15 @@ import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GoblinWardriver.java b/Mage.Sets/src/mage/cards/g/GoblinWardriver.java index 22c7f888a43..8779e22a9c2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWardriver.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWardriver.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BattleCryAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarrens.java b/Mage.Sets/src/mage/cards/g/GoblinWarrens.java index b939bb0f44c..8e2381b6664 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarrens.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarrens.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -41,6 +40,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.permanent.token.GoblinToken; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GoblinWizard.java b/Mage.Sets/src/mage/cards/g/GoblinWizard.java index 13a433bf123..1f5a308f5b2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWizard.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWizard.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -49,6 +48,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author BursegSardaukar diff --git a/Mage.Sets/src/mage/cards/g/GoblinsOfTheFlarg.java b/Mage.Sets/src/mage/cards/g/GoblinsOfTheFlarg.java index ec99f32bf62..207995e4bb5 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinsOfTheFlarg.java +++ b/Mage.Sets/src/mage/cards/g/GoblinsOfTheFlarg.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -39,6 +38,8 @@ import mage.filter.Filter; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Goblinslide.java b/Mage.Sets/src/mage/cards/g/Goblinslide.java index 1114cf302cf..7eb34c68cd2 100644 --- a/Mage.Sets/src/mage/cards/g/Goblinslide.java +++ b/Mage.Sets/src/mage/cards/g/Goblinslide.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.GoblinTokenWithHaste; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java b/Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java index 2bea2af4948..56e88ed6761 100644 --- a/Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java +++ b/Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java index 1ff3e3541aa..44c31e0caf1 100644 --- a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java +++ b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.SetPowerToughnessAllEffect; @@ -41,6 +40,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java b/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java index 20ab963c612..a1a46589b78 100644 --- a/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java +++ b/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent; @@ -40,6 +39,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.EnchantedPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GodlessShrine.java b/Mage.Sets/src/mage/cards/g/GodlessShrine.java index e8444f7afaa..12895b13b3f 100644 --- a/Mage.Sets/src/mage/cards/g/GodlessShrine.java +++ b/Mage.Sets/src/mage/cards/g/GodlessShrine.java @@ -28,8 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.TapSourceUnlessPaysEffect; @@ -37,6 +35,9 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java index 181422cc76a..16a0bae7c59 100644 --- a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java +++ b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; @@ -52,6 +52,8 @@ import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCardInLibrary; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 @@ -66,7 +68,7 @@ public class GodoBanditWarlord extends CardImpl { public GodoBanditWarlord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Barbarian"); diff --git a/Mage.Sets/src/mage/cards/g/GodosIrregulars.java b/Mage.Sets/src/mage/cards/g/GodosIrregulars.java index 1aeeb8e9903..93882519cd6 100644 --- a/Mage.Sets/src/mage/cards/g/GodosIrregulars.java +++ b/Mage.Sets/src/mage/cards/g/GodosIrregulars.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GodsEyeGateToTheReikai.java b/Mage.Sets/src/mage/cards/g/GodsEyeGateToTheReikai.java index 315e2058de7..537a5839f95 100644 --- a/Mage.Sets/src/mage/cards/g/GodsEyeGateToTheReikai.java +++ b/Mage.Sets/src/mage/cards/g/GodsEyeGateToTheReikai.java @@ -27,15 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.permanent.token.SpiritToken; +import java.util.UUID; + /** * * @author Loki @@ -44,7 +46,7 @@ public class GodsEyeGateToTheReikai extends CardImpl { public GodsEyeGateToTheReikai(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); // When Gods' Eye, Gate to the Reikai is put into a graveyard from the battlefield, create a 1/1 colorless Spirit creature token. diff --git a/Mage.Sets/src/mage/cards/g/GodsWilling.java b/Mage.Sets/src/mage/cards/g/GodsWilling.java index 92bf1994476..d0124dc1b05 100644 --- a/Mage.Sets/src/mage/cards/g/GodsWilling.java +++ b/Mage.Sets/src/mage/cards/g/GodsWilling.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continuous.GainProtectionFromColorTargetEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Godsend.java b/Mage.Sets/src/mage/cards/g/Godsend.java index 209aa263419..50b5ba68e54 100644 --- a/Mage.Sets/src/mage/cards/g/Godsend.java +++ b/Mage.Sets/src/mage/cards/g/Godsend.java @@ -27,11 +27,6 @@ */ package mage.cards.g; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -44,10 +39,7 @@ import mage.abilities.keyword.EquipAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.PermanentIdPredicate; @@ -63,6 +55,8 @@ import mage.target.targetpointer.FirstTargetPointer; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.*; + /** * * @author LevelX2 @@ -71,7 +65,7 @@ public class Godsend extends CardImpl { public Godsend(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature gets +3/+3. diff --git a/Mage.Sets/src/mage/cards/g/Godsire.java b/Mage.Sets/src/mage/cards/g/Godsire.java index 28bbe9dd373..34310af3364 100644 --- a/Mage.Sets/src/mage/cards/g/Godsire.java +++ b/Mage.Sets/src/mage/cards/g/Godsire.java @@ -28,7 +28,6 @@ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Godtoucher.java b/Mage.Sets/src/mage/cards/g/Godtoucher.java index 5cb486de83c..fd6aca7d984 100644 --- a/Mage.Sets/src/mage/cards/g/Godtoucher.java +++ b/Mage.Sets/src/mage/cards/g/Godtoucher.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +35,9 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.PreventionEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GodtrackerOfJund.java b/Mage.Sets/src/mage/cards/g/GodtrackerOfJund.java index 67963335fdf..6baeb99c54b 100644 --- a/Mage.Sets/src/mage/cards/g/GodtrackerOfJund.java +++ b/Mage.Sets/src/mage/cards/g/GodtrackerOfJund.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -40,6 +39,8 @@ import mage.filter.Filter; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GoldForgedSentinel.java b/Mage.Sets/src/mage/cards/g/GoldForgedSentinel.java index 03529ec53d8..d3ab68ec2d0 100644 --- a/Mage.Sets/src/mage/cards/g/GoldForgedSentinel.java +++ b/Mage.Sets/src/mage/cards/g/GoldForgedSentinel.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoldMyr.java b/Mage.Sets/src/mage/cards/g/GoldMyr.java index 53c28bcbcd8..09c19a08927 100644 --- a/Mage.Sets/src/mage/cards/g/GoldMyr.java +++ b/Mage.Sets/src/mage/cards/g/GoldMyr.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoldenBear.java b/Mage.Sets/src/mage/cards/g/GoldenBear.java index 39ca9922bc8..ae0df2017d4 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenBear.java +++ b/Mage.Sets/src/mage/cards/g/GoldenBear.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoldenHind.java b/Mage.Sets/src/mage/cards/g/GoldenHind.java index 2f629db8fd9..a804094fd6e 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenHind.java +++ b/Mage.Sets/src/mage/cards/g/GoldenHind.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoldenUrn.java b/Mage.Sets/src/mage/cards/g/GoldenUrn.java index 12342722f3d..3a2ac568d17 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenUrn.java +++ b/Mage.Sets/src/mage/cards/g/GoldenUrn.java @@ -28,8 +28,6 @@ package mage.cards.g; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +43,8 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoldenWish.java b/Mage.Sets/src/mage/cards/g/GoldenWish.java index 2ec362ccf0a..31290d66c5b 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenWish.java +++ b/Mage.Sets/src/mage/cards/g/GoldenWish.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.WishEffect; import mage.cards.CardImpl; @@ -37,6 +36,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GoldenglowMoth.java b/Mage.Sets/src/mage/cards/g/GoldenglowMoth.java index d8e4bbc65cd..9caaf7c37a8 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenglowMoth.java +++ b/Mage.Sets/src/mage/cards/g/GoldenglowMoth.java @@ -28,14 +28,15 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoldenhideOx.java b/Mage.Sets/src/mage/cards/g/GoldenhideOx.java index b9b489604d1..72080925e95 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenhideOx.java +++ b/Mage.Sets/src/mage/cards/g/GoldenhideOx.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.abilityword.ConstellationAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoldmeadowDodger.java b/Mage.Sets/src/mage/cards/g/GoldmeadowDodger.java index bd95e1e8c4c..4c6627854d3 100644 --- a/Mage.Sets/src/mage/cards/g/GoldmeadowDodger.java +++ b/Mage.Sets/src/mage/cards/g/GoldmeadowDodger.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -39,6 +38,8 @@ import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java b/Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java index 2061019f049..f0280a46586 100644 --- a/Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java +++ b/Mage.Sets/src/mage/cards/g/GoldmeadowHarrier.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +36,12 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java b/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java index 3eaa8f5af42..b18bf0a00dd 100644 --- a/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java +++ b/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoldmeadowStalwart.java b/Mage.Sets/src/mage/cards/g/GoldmeadowStalwart.java index 448f4a4eaf3..b8d5a937e93 100644 --- a/Mage.Sets/src/mage/cards/g/GoldmeadowStalwart.java +++ b/Mage.Sets/src/mage/cards/g/GoldmeadowStalwart.java @@ -27,18 +27,19 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.costs.OrCost; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.costs.mana.GenericManaCost; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java b/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java index 8ac451994ea..4908d2352ab 100644 --- a/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java +++ b/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoldnightCommander.java b/Mage.Sets/src/mage/cards/g/GoldnightCommander.java index d58511e3920..0371c8f3ed3 100644 --- a/Mage.Sets/src/mage/cards/g/GoldnightCommander.java +++ b/Mage.Sets/src/mage/cards/g/GoldnightCommander.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java b/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java index ee591041191..5562d1e40ff 100644 --- a/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java +++ b/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; diff --git a/Mage.Sets/src/mage/cards/g/GolemArtisan.java b/Mage.Sets/src/mage/cards/g/GolemArtisan.java index 368fe6f6aed..f1f087a0f11 100644 --- a/Mage.Sets/src/mage/cards/g/GolemArtisan.java +++ b/Mage.Sets/src/mage/cards/g/GolemArtisan.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,13 +42,20 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceImpl; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/g/GolemFoundry.java b/Mage.Sets/src/mage/cards/g/GolemFoundry.java index a2f90dbaba3..817f4bb8ab3 100644 --- a/Mage.Sets/src/mage/cards/g/GolemFoundry.java +++ b/Mage.Sets/src/mage/cards/g/GolemFoundry.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -37,10 +34,14 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterArtifactSpell; import mage.game.permanent.token.GolemToken; +import java.util.UUID; + /** * * @author Loki, North diff --git a/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java b/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java index cc07177f53a..bdcd7ccb5b8 100644 --- a/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java +++ b/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java @@ -37,7 +37,10 @@ import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/g/GolemsHeart.java b/Mage.Sets/src/mage/cards/g/GolemsHeart.java index 2ab886d12dc..caeaaaddf5e 100644 --- a/Mage.Sets/src/mage/cards/g/GolemsHeart.java +++ b/Mage.Sets/src/mage/cards/g/GolemsHeart.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; @@ -39,6 +38,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GolgariBrownscale.java b/Mage.Sets/src/mage/cards/g/GolgariBrownscale.java index 85fe9f3120c..94c13aa7ae5 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariBrownscale.java +++ b/Mage.Sets/src/mage/cards/g/GolgariBrownscale.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GolgariCharm.java b/Mage.Sets/src/mage/cards/g/GolgariCharm.java index 0221e9aa6cd..46f1650dfd9 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariCharm.java +++ b/Mage.Sets/src/mage/cards/g/GolgariCharm.java @@ -27,19 +27,20 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.RegenerateAllEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GolgariCluestone.java b/Mage.Sets/src/mage/cards/g/GolgariCluestone.java index 784dd5f9ca4..70485471e01 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariCluestone.java +++ b/Mage.Sets/src/mage/cards/g/GolgariCluestone.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +38,10 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GolgariDecoy.java b/Mage.Sets/src/mage/cards/g/GolgariDecoy.java index 0af7ea40de2..678296527f1 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariDecoy.java +++ b/Mage.Sets/src/mage/cards/g/GolgariDecoy.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +34,11 @@ import mage.abilities.effects.common.combat.MustBeBlockedByAllSourceEffect; import mage.abilities.keyword.ScavengeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GolgariGermination.java b/Mage.Sets/src/mage/cards/g/GolgariGermination.java index 814d6b57b14..f668e00e7d6 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariGermination.java +++ b/Mage.Sets/src/mage/cards/g/GolgariGermination.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -40,6 +39,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SaprolingToken; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java b/Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java index 65ff855217c..29bbb92b324 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java +++ b/Mage.Sets/src/mage/cards/g/GolgariGraveTroll.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -49,6 +48,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GolgariGuildgate.java b/Mage.Sets/src/mage/cards/g/GolgariGuildgate.java index ecab71efe88..77b094e1670 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariGuildgate.java +++ b/Mage.Sets/src/mage/cards/g/GolgariGuildgate.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GolgariGuildmage.java b/Mage.Sets/src/mage/cards/g/GolgariGuildmage.java index 5c990dfff2d..c2e1382bdb6 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariGuildmage.java +++ b/Mage.Sets/src/mage/cards/g/GolgariGuildmage.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +37,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; @@ -47,6 +45,8 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GolgariLonglegs.java b/Mage.Sets/src/mage/cards/g/GolgariLonglegs.java index b5c0d62cae9..a42a65d801f 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariLonglegs.java +++ b/Mage.Sets/src/mage/cards/g/GolgariLonglegs.java @@ -27,11 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GolgariRotFarm.java b/Mage.Sets/src/mage/cards/g/GolgariRotFarm.java index c0fb393ceb9..97de881cf4c 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariRotFarm.java +++ b/Mage.Sets/src/mage/cards/g/GolgariRotFarm.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.g; -import java.util.UUID; + import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GolgariRotwurm.java b/Mage.Sets/src/mage/cards/g/GolgariRotwurm.java index bede0ec00fe..06ec9a12125 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariRotwurm.java +++ b/Mage.Sets/src/mage/cards/g/GolgariRotwurm.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +35,14 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GolgariSignet.java b/Mage.Sets/src/mage/cards/g/GolgariSignet.java index 7b43493ecef..7a097cd803b 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariSignet.java +++ b/Mage.Sets/src/mage/cards/g/GolgariSignet.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -38,8 +35,11 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GolgariThug.java b/Mage.Sets/src/mage/cards/g/GolgariThug.java index 87424135c59..b5289cc9fa1 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariThug.java +++ b/Mage.Sets/src/mage/cards/g/GolgariThug.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -36,10 +34,13 @@ import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GolgothianSylex.java b/Mage.Sets/src/mage/cards/g/GolgothianSylex.java index db187142ea1..218d4c23fbf 100644 --- a/Mage.Sets/src/mage/cards/g/GolgothianSylex.java +++ b/Mage.Sets/src/mage/cards/g/GolgothianSylex.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author MarcoMarin diff --git a/Mage.Sets/src/mage/cards/g/GoliathBeetle.java b/Mage.Sets/src/mage/cards/g/GoliathBeetle.java index 136d8272a7f..cefee97dbe0 100644 --- a/Mage.Sets/src/mage/cards/g/GoliathBeetle.java +++ b/Mage.Sets/src/mage/cards/g/GoliathBeetle.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoliathSphinx.java b/Mage.Sets/src/mage/cards/g/GoliathSphinx.java index d2b6d9d281b..1fd314b6795 100644 --- a/Mage.Sets/src/mage/cards/g/GoliathSphinx.java +++ b/Mage.Sets/src/mage/cards/g/GoliathSphinx.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoliathSpider.java b/Mage.Sets/src/mage/cards/g/GoliathSpider.java index cc556a39f72..8ead479c42b 100644 --- a/Mage.Sets/src/mage/cards/g/GoliathSpider.java +++ b/Mage.Sets/src/mage/cards/g/GoliathSpider.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/Gomazoa.java b/Mage.Sets/src/mage/cards/g/Gomazoa.java index 25fb7ea8727..4eb27b36dfd 100644 --- a/Mage.Sets/src/mage/cards/g/Gomazoa.java +++ b/Mage.Sets/src/mage/cards/g/Gomazoa.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +46,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.Watcher; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GoneMissing.java b/Mage.Sets/src/mage/cards/g/GoneMissing.java index 2566733e2a2..e0d8da61202 100644 --- a/Mage.Sets/src/mage/cards/g/GoneMissing.java +++ b/Mage.Sets/src/mage/cards/g/GoneMissing.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.effects.keyword.InvestigateEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java b/Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java index 14186d4b5f0..e64f7bc1873 100644 --- a/Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java +++ b/Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -40,17 +37,8 @@ import mage.abilities.effects.AsThoughManaEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.DeathtouchAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.ManaType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.FilterCard; import mage.game.ExileZone; import mage.game.Game; @@ -61,6 +49,10 @@ import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -71,7 +63,7 @@ public class GontiLordOfLuxury extends CardImpl { public GontiLordOfLuxury(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Aetherborn"); this.subtype.add("Rogue"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java b/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java index ee085a07396..b77cd9f9231 100644 --- a/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java +++ b/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +37,14 @@ import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -58,7 +60,7 @@ public class GontisAetherHeart extends CardImpl { public GontisAetherHeart(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Whenever Gonti's Aether Heart or another artifact enters the battlefield under your control, you get {E}{E} (two energy counters). this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new GetEnergyCountersControllerEffect(2), filter, false)); diff --git a/Mage.Sets/src/mage/cards/g/GontisMachinations.java b/Mage.Sets/src/mage/cards/g/GontisMachinations.java index 3752633a1eb..b1aa454a015 100644 --- a/Mage.Sets/src/mage/cards/g/GontisMachinations.java +++ b/Mage.Sets/src/mage/cards/g/GontisMachinations.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +44,10 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GoreHouseChainwalker.java b/Mage.Sets/src/mage/cards/g/GoreHouseChainwalker.java index 3d3d136b743..c219d3bb117 100644 --- a/Mage.Sets/src/mage/cards/g/GoreHouseChainwalker.java +++ b/Mage.Sets/src/mage/cards/g/GoreHouseChainwalker.java @@ -26,13 +26,14 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.g; - -import java.util.UUID; -import mage.constants.CardType; + import mage.MageInt; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoreSwine.java b/Mage.Sets/src/mage/cards/g/GoreSwine.java index ef17a5cf028..da2d27cc6c8 100644 --- a/Mage.Sets/src/mage/cards/g/GoreSwine.java +++ b/Mage.Sets/src/mage/cards/g/GoreSwine.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GoreVassal.java b/Mage.Sets/src/mage/cards/g/GoreVassal.java index 948620b1f07..0736a915307 100644 --- a/Mage.Sets/src/mage/cards/g/GoreVassal.java +++ b/Mage.Sets/src/mage/cards/g/GoreVassal.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -37,9 +34,13 @@ import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GorehornMinotaurs.java b/Mage.Sets/src/mage/cards/g/GorehornMinotaurs.java index 6fc308393f8..60a0695d8af 100644 --- a/Mage.Sets/src/mage/cards/g/GorehornMinotaurs.java +++ b/Mage.Sets/src/mage/cards/g/GorehornMinotaurs.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.BloodthirstAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoretuskFirebeast.java b/Mage.Sets/src/mage/cards/g/GoretuskFirebeast.java index 9bed064a927..e60b716dcab 100644 --- a/Mage.Sets/src/mage/cards/g/GoretuskFirebeast.java +++ b/Mage.Sets/src/mage/cards/g/GoretuskFirebeast.java @@ -27,16 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Backfir3 diff --git a/Mage.Sets/src/mage/cards/g/GorgerWurm.java b/Mage.Sets/src/mage/cards/g/GorgerWurm.java index 615cc1fb606..8b60c0f5fe5 100644 --- a/Mage.Sets/src/mage/cards/g/GorgerWurm.java +++ b/Mage.Sets/src/mage/cards/g/GorgerWurm.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.effects.common.DevourEffect; import mage.abilities.keyword.DevourAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GorgonFlail.java b/Mage.Sets/src/mage/cards/g/GorgonFlail.java index b11ca8a6ef3..136d1a7a80b 100644 --- a/Mage.Sets/src/mage/cards/g/GorgonFlail.java +++ b/Mage.Sets/src/mage/cards/g/GorgonFlail.java @@ -27,11 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -40,6 +35,12 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GorgonRecluse.java b/Mage.Sets/src/mage/cards/g/GorgonRecluse.java index fda81d4cb08..0e72fc521fd 100644 --- a/Mage.Sets/src/mage/cards/g/GorgonRecluse.java +++ b/Mage.Sets/src/mage/cards/g/GorgonRecluse.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author nigelzor diff --git a/Mage.Sets/src/mage/cards/g/GorgonsHead.java b/Mage.Sets/src/mage/cards/g/GorgonsHead.java index 01d263ade53..0391c2fa47e 100644 --- a/Mage.Sets/src/mage/cards/g/GorgonsHead.java +++ b/Mage.Sets/src/mage/cards/g/GorgonsHead.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java b/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java index 0e7945d28ec..03b29d40ac6 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java +++ b/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedByOneEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GorillaChieftain.java b/Mage.Sets/src/mage/cards/g/GorillaChieftain.java index 87a38ec3956..154c6f7d02d 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaChieftain.java +++ b/Mage.Sets/src/mage/cards/g/GorillaChieftain.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GorillaPack.java b/Mage.Sets/src/mage/cards/g/GorillaPack.java index cc207a78f52..dbe163a2086 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaPack.java +++ b/Mage.Sets/src/mage/cards/g/GorillaPack.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GorillaShaman.java b/Mage.Sets/src/mage/cards/g/GorillaShaman.java index 82652461694..cd5f9e73a54 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaShaman.java +++ b/Mage.Sets/src/mage/cards/g/GorillaShaman.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GorillaTitan.java b/Mage.Sets/src/mage/cards/g/GorillaTitan.java index ee2c8ef3738..4bf9c094486 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaTitan.java +++ b/Mage.Sets/src/mage/cards/g/GorillaTitan.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GorillaWarCry.java b/Mage.Sets/src/mage/cards/g/GorillaWarCry.java index f3385a2c3b5..65d2a033723 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaWarCry.java +++ b/Mage.Sets/src/mage/cards/g/GorillaWarCry.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.condition.common.BeforeBlockersAreDeclaredCondition; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.TurnPhase; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GorillaWarrior.java b/Mage.Sets/src/mage/cards/g/GorillaWarrior.java index e9bf5e4b468..88dcd2c84fb 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaWarrior.java +++ b/Mage.Sets/src/mage/cards/g/GorillaWarrior.java @@ -28,11 +28,12 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GoryosVengeance.java b/Mage.Sets/src/mage/cards/g/GoryosVengeance.java index e19f25160ab..46568679cfc 100644 --- a/Mage.Sets/src/mage/cards/g/GoryosVengeance.java +++ b/Mage.Sets/src/mage/cards/g/GoryosVengeance.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -53,6 +52,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GossamerChains.java b/Mage.Sets/src/mage/cards/g/GossamerChains.java index 5a9c9cc6d7e..6b068cb6ade 100644 --- a/Mage.Sets/src/mage/cards/g/GossamerChains.java +++ b/Mage.Sets/src/mage/cards/g/GossamerChains.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandFromBattlefieldSourceCost; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.UnblockedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GossamerPhantasm.java b/Mage.Sets/src/mage/cards/g/GossamerPhantasm.java index 280d997d4c3..0f2e91abe35 100644 --- a/Mage.Sets/src/mage/cards/g/GossamerPhantasm.java +++ b/Mage.Sets/src/mage/cards/g/GossamerPhantasm.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GovernTheGuildless.java b/Mage.Sets/src/mage/cards/g/GovernTheGuildless.java index 492d5838a27..8a01bf87eab 100644 --- a/Mage.Sets/src/mage/cards/g/GovernTheGuildless.java +++ b/Mage.Sets/src/mage/cards/g/GovernTheGuildless.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BecomesColorTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; @@ -40,6 +39,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.MonocoloredPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Wehk diff --git a/Mage.Sets/src/mage/cards/g/GrabTheReins.java b/Mage.Sets/src/mage/cards/g/GrabTheReins.java index 5782572e465..cf226b32838 100644 --- a/Mage.Sets/src/mage/cards/g/GrabTheReins.java +++ b/Mage.Sets/src/mage/cards/g/GrabTheReins.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.Effect; @@ -48,6 +47,8 @@ import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java b/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java index 218afdd85b0..3f252ef4244 100644 --- a/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java +++ b/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.AuraAttachedCount; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GracefulAdept.java b/Mage.Sets/src/mage/cards/g/GracefulAdept.java index 10013911bdc..b6dd662f13f 100644 --- a/Mage.Sets/src/mage/cards/g/GracefulAdept.java +++ b/Mage.Sets/src/mage/cards/g/GracefulAdept.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -38,6 +34,11 @@ import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect.HandSizeModification; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GracefulAntelope.java b/Mage.Sets/src/mage/cards/g/GracefulAntelope.java index 2085787674a..5cf5fe6b3d3 100644 --- a/Mage.Sets/src/mage/cards/g/GracefulAntelope.java +++ b/Mage.Sets/src/mage/cards/g/GracefulAntelope.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.target.Target; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author cbt33, Loki (Contaminated Ground), Plopman (Larceny) diff --git a/Mage.Sets/src/mage/cards/g/GracefulReprieve.java b/Mage.Sets/src/mage/cards/g/GracefulReprieve.java index f727f6d91b7..cb5f326be2d 100644 --- a/Mage.Sets/src/mage/cards/g/GracefulReprieve.java +++ b/Mage.Sets/src/mage/cards/g/GracefulReprieve.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GrafHarvest.java b/Mage.Sets/src/mage/cards/g/GrafHarvest.java index 35bc105f1ab..47669f222aa 100644 --- a/Mage.Sets/src/mage/cards/g/GrafHarvest.java +++ b/Mage.Sets/src/mage/cards/g/GrafHarvest.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -48,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/GrafMole.java b/Mage.Sets/src/mage/cards/g/GrafMole.java index 050fa143b1c..1805f73a849 100644 --- a/Mage.Sets/src/mage/cards/g/GrafMole.java +++ b/Mage.Sets/src/mage/cards/g/GrafMole.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java b/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java index bc07a31920d..64588972143 100644 --- a/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java +++ b/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java @@ -27,23 +27,23 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java b/Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java index ac1f0fd9b40..fe9b60ebbee 100644 --- a/Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java +++ b/Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.UnattachedTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -40,6 +37,12 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GraftedSkullcap.java b/Mage.Sets/src/mage/cards/g/GraftedSkullcap.java index b95dde453db..016104f44c2 100644 --- a/Mage.Sets/src/mage/cards/g/GraftedSkullcap.java +++ b/Mage.Sets/src/mage/cards/g/GraftedSkullcap.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GraftedWargear.java b/Mage.Sets/src/mage/cards/g/GraftedWargear.java index d3194e1de83..ae5c3803edd 100644 --- a/Mage.Sets/src/mage/cards/g/GraftedWargear.java +++ b/Mage.Sets/src/mage/cards/g/GraftedWargear.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.UnattachedTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrandAbolisher.java b/Mage.Sets/src/mage/cards/g/GrandAbolisher.java index df26b49d403..3136d887ac0 100644 --- a/Mage.Sets/src/mage/cards/g/GrandAbolisher.java +++ b/Mage.Sets/src/mage/cards/g/GrandAbolisher.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * @author nantuko */ diff --git a/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java b/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java index 636b2e8f752..c91e672fbda 100644 --- a/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java +++ b/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java @@ -37,11 +37,7 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -62,7 +58,7 @@ public class GrandArbiterAugustinIV extends CardImpl { public GrandArbiterAugustinIV(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/g/GrandArchitect.java b/Mage.Sets/src/mage/cards/g/GrandArchitect.java index 5bff9e76034..ad1e0f67a2f 100644 --- a/Mage.Sets/src/mage/cards/g/GrandArchitect.java +++ b/Mage.Sets/src/mage/cards/g/GrandArchitect.java @@ -27,12 +27,7 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.ConditionalMana; -import mage.MageInt; -import mage.MageObject; -import mage.Mana; -import mage.ObjectColor; +import mage.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,12 +40,7 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -62,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com, nantuko diff --git a/Mage.Sets/src/mage/cards/g/GrandColiseum.java b/Mage.Sets/src/mage/cards/g/GrandColiseum.java index 14ea0416a3c..d2e056abad7 100644 --- a/Mage.Sets/src/mage/cards/g/GrandColiseum.java +++ b/Mage.Sets/src/mage/cards/g/GrandColiseum.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.DamageControllerEffect; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author KholdFuzion diff --git a/Mage.Sets/src/mage/cards/g/GrandMelee.java b/Mage.Sets/src/mage/cards/g/GrandMelee.java index 62c8b6ee880..d9f73d49b5e 100644 --- a/Mage.Sets/src/mage/cards/g/GrandMelee.java +++ b/Mage.Sets/src/mage/cards/g/GrandMelee.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.AttacksIfAbleAllEffect; @@ -39,6 +38,8 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author fenhl diff --git a/Mage.Sets/src/mage/cards/g/GrandMoffTarkin.java b/Mage.Sets/src/mage/cards/g/GrandMoffTarkin.java index 3cb1f6b60da..d549ccab1ba 100644 --- a/Mage.Sets/src/mage/cards/g/GrandMoffTarkin.java +++ b/Mage.Sets/src/mage/cards/g/GrandMoffTarkin.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -37,16 +36,19 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; -import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Styxo/spjspj @@ -55,7 +57,7 @@ public class GrandMoffTarkin extends CardImpl { public GrandMoffTarkin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/g/GrandmotherSengir.java b/Mage.Sets/src/mage/cards/g/GrandmotherSengir.java index 0fa3bb3355a..921aeb3927f 100644 --- a/Mage.Sets/src/mage/cards/g/GrandmotherSengir.java +++ b/Mage.Sets/src/mage/cards/g/GrandmotherSengir.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +37,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author hanasu @@ -49,7 +51,7 @@ public class GrandmotherSengir extends CardImpl { public GrandmotherSengir(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java b/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java index 5ef84eb0b5b..ef22f7a30e1 100644 --- a/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java +++ b/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GraniteGargoyle.java b/Mage.Sets/src/mage/cards/g/GraniteGargoyle.java index 994d4ca8c10..762d7d5568a 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGargoyle.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGargoyle.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GraniteGrip.java b/Mage.Sets/src/mage/cards/g/GraniteGrip.java index 28cef455373..0de7f25519a 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGrip.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGrip.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; @@ -37,12 +34,15 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GraniteShard.java b/Mage.Sets/src/mage/cards/g/GraniteShard.java index 96940fc9551..b1a031be96a 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteShard.java +++ b/Mage.Sets/src/mage/cards/g/GraniteShard.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/Granulate.java b/Mage.Sets/src/mage/cards/g/Granulate.java index e583326ea04..a5dd68d8ac8 100644 --- a/Mage.Sets/src/mage/cards/g/Granulate.java +++ b/Mage.Sets/src/mage/cards/g/Granulate.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,6 +36,8 @@ import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/Grapeshot.java b/Mage.Sets/src/mage/cards/g/Grapeshot.java index 8af88a2ccca..be18109ba65 100644 --- a/Mage.Sets/src/mage/cards/g/Grapeshot.java +++ b/Mage.Sets/src/mage/cards/g/Grapeshot.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java b/Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java index f8d715a5c13..202774507fe 100644 --- a/Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java +++ b/Mage.Sets/src/mage/cards/g/GrapeshotCatapult.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/g/GrappleWithThePast.java b/Mage.Sets/src/mage/cards/g/GrappleWithThePast.java index ba5fa7a1e35..3f7f4a0c666 100644 --- a/Mage.Sets/src/mage/cards/g/GrappleWithThePast.java +++ b/Mage.Sets/src/mage/cards/g/GrappleWithThePast.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; @@ -44,6 +43,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrapplerSpider.java b/Mage.Sets/src/mage/cards/g/GrapplerSpider.java index b8082101272..9d726d479e1 100644 --- a/Mage.Sets/src/mage/cards/g/GrapplerSpider.java +++ b/Mage.Sets/src/mage/cards/g/GrapplerSpider.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrapplingHook.java b/Mage.Sets/src/mage/cards/g/GrapplingHook.java index 19952f6a5ae..d163a3025c8 100644 --- a/Mage.Sets/src/mage/cards/g/GrapplingHook.java +++ b/Mage.Sets/src/mage/cards/g/GrapplingHook.java @@ -27,12 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.AttacksAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,10 +37,13 @@ import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GraspOfDarkness.java b/Mage.Sets/src/mage/cards/g/GraspOfDarkness.java index a2241c57931..d9d8727cd4b 100644 --- a/Mage.Sets/src/mage/cards/g/GraspOfDarkness.java +++ b/Mage.Sets/src/mage/cards/g/GraspOfDarkness.java @@ -28,14 +28,15 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GraspOfFate.java b/Mage.Sets/src/mage/cards/g/GraspOfFate.java index df48fd761d8..88644e478bc 100644 --- a/Mage.Sets/src/mage/cards/g/GraspOfFate.java +++ b/Mage.Sets/src/mage/cards/g/GraspOfFate.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility; @@ -44,7 +43,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; -import static mage.filter.predicate.permanent.ControllerControlsIslandPredicate.filter; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -52,6 +50,10 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.util.CardUtil; +import java.util.UUID; + +import static mage.filter.predicate.permanent.ControllerControlsIslandPredicate.filter; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GraspOfPhantoms.java b/Mage.Sets/src/mage/cards/g/GraspOfPhantoms.java index 9e1463218e6..a749b04c1fb 100644 --- a/Mage.Sets/src/mage/cards/g/GraspOfPhantoms.java +++ b/Mage.Sets/src/mage/cards/g/GraspOfPhantoms.java @@ -27,17 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TimingRule; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java b/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java index 8f55a36f526..2fa213f12bb 100644 --- a/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java +++ b/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/Grasslands.java b/Mage.Sets/src/mage/cards/g/Grasslands.java index 0cbc8a10610..c7d36828caa 100644 --- a/Mage.Sets/src/mage/cards/g/Grasslands.java +++ b/Mage.Sets/src/mage/cards/g/Grasslands.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java index 2465d48dde0..d243c1fd160 100644 --- a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java +++ b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -41,6 +40,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GraveBetrayal.java b/Mage.Sets/src/mage/cards/g/GraveBetrayal.java index a8f648af1a4..751830c5d69 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBetrayal.java +++ b/Mage.Sets/src/mage/cards/g/GraveBetrayal.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -39,12 +38,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; @@ -53,6 +47,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GraveBirthing.java b/Mage.Sets/src/mage/cards/g/GraveBirthing.java index cd8c0849028..86d09728367 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBirthing.java +++ b/Mage.Sets/src/mage/cards/g/GraveBirthing.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -47,6 +46,8 @@ import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GraveBramble.java b/Mage.Sets/src/mage/cards/g/GraveBramble.java index 00671c86a29..0034df0dcdd 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBramble.java +++ b/Mage.Sets/src/mage/cards/g/GraveBramble.java @@ -27,17 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GraveDefiler.java b/Mage.Sets/src/mage/cards/g/GraveDefiler.java index dc0ed10ab88..d7830bc7cd9 100644 --- a/Mage.Sets/src/mage/cards/g/GraveDefiler.java +++ b/Mage.Sets/src/mage/cards/g/GraveDefiler.java @@ -27,20 +27,21 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; +import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GraveExchange.java b/Mage.Sets/src/mage/cards/g/GraveExchange.java index fed5d6a8ed5..4e1a2627a86 100644 --- a/Mage.Sets/src/mage/cards/g/GraveExchange.java +++ b/Mage.Sets/src/mage/cards/g/GraveExchange.java @@ -27,14 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -45,6 +44,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GravePact.java b/Mage.Sets/src/mage/cards/g/GravePact.java index 044f75d37bd..8298399fba3 100644 --- a/Mage.Sets/src/mage/cards/g/GravePact.java +++ b/Mage.Sets/src/mage/cards/g/GravePact.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; @@ -46,6 +43,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GravePeril.java b/Mage.Sets/src/mage/cards/g/GravePeril.java index d0edc88b67d..f699fa972ab 100644 --- a/Mage.Sets/src/mage/cards/g/GravePeril.java +++ b/Mage.Sets/src/mage/cards/g/GravePeril.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GraveRobbers.java b/Mage.Sets/src/mage/cards/g/GraveRobbers.java index 57933c75986..e469794b7be 100644 --- a/Mage.Sets/src/mage/cards/g/GraveRobbers.java +++ b/Mage.Sets/src/mage/cards/g/GraveRobbers.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GraveScrabbler.java b/Mage.Sets/src/mage/cards/g/GraveScrabbler.java index 80cfba14ca6..8d5648a3b2b 100644 --- a/Mage.Sets/src/mage/cards/g/GraveScrabbler.java +++ b/Mage.Sets/src/mage/cards/g/GraveScrabbler.java @@ -1,7 +1,5 @@ package mage.cards.g; -import java.util.UUID; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -19,6 +17,8 @@ import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + public class GraveScrabbler extends CardImpl { public GraveScrabbler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GraveServitude.java b/Mage.Sets/src/mage/cards/g/GraveServitude.java index 5d2100b1db2..d14481b4f46 100644 --- a/Mage.Sets/src/mage/cards/g/GraveServitude.java +++ b/Mage.Sets/src/mage/cards/g/GraveServitude.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SacrificeIfCastAtInstantTimeTriggeredAbility; @@ -40,14 +39,12 @@ import mage.abilities.effects.common.continuous.SetCardColorAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GraveShellScarab.java b/Mage.Sets/src/mage/cards/g/GraveShellScarab.java index aaa8a14ef2b..8dd08424a70 100644 --- a/Mage.Sets/src/mage/cards/g/GraveShellScarab.java +++ b/Mage.Sets/src/mage/cards/g/GraveShellScarab.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +36,11 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jonubuu diff --git a/Mage.Sets/src/mage/cards/g/GraveSifter.java b/Mage.Sets/src/mage/cards/g/GraveSifter.java index 643d3ff1d75..509f0cfb395 100644 --- a/Mage.Sets/src/mage/cards/g/GraveSifter.java +++ b/Mage.Sets/src/mage/cards/g/GraveSifter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -49,6 +48,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GraveStrength.java b/Mage.Sets/src/mage/cards/g/GraveStrength.java index d8bfe97205d..1ad0e82bf52 100644 --- a/Mage.Sets/src/mage/cards/g/GraveStrength.java +++ b/Mage.Sets/src/mage/cards/g/GraveStrength.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; @@ -39,6 +38,8 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GraveTitan.java b/Mage.Sets/src/mage/cards/g/GraveTitan.java index fb8e7b2de3b..a1e09527f44 100644 --- a/Mage.Sets/src/mage/cards/g/GraveTitan.java +++ b/Mage.Sets/src/mage/cards/g/GraveTitan.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GraveUpheaval.java b/Mage.Sets/src/mage/cards/g/GraveUpheaval.java index 60ccfd47007..8b2c2ff5155 100644 --- a/Mage.Sets/src/mage/cards/g/GraveUpheaval.java +++ b/Mage.Sets/src/mage/cards/g/GraveUpheaval.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffect; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.target.common.TargetCardInGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GravebaneZombie.java b/Mage.Sets/src/mage/cards/g/GravebaneZombie.java index 28758bd6549..6c2bf215f88 100644 --- a/Mage.Sets/src/mage/cards/g/GravebaneZombie.java +++ b/Mage.Sets/src/mage/cards/g/GravebaneZombie.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/Gravebind.java b/Mage.Sets/src/mage/cards/g/Gravebind.java index c1c77fc34bd..f4a0fa6c262 100644 --- a/Mage.Sets/src/mage/cards/g/Gravebind.java +++ b/Mage.Sets/src/mage/cards/g/Gravebind.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.CantBeRegeneratedTargetEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GravebladeMarauder.java b/Mage.Sets/src/mage/cards/g/GravebladeMarauder.java index 197968846e5..3771be17ec9 100644 --- a/Mage.Sets/src/mage/cards/g/GravebladeMarauder.java +++ b/Mage.Sets/src/mage/cards/g/GravebladeMarauder.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GravebornMuse.java b/Mage.Sets/src/mage/cards/g/GravebornMuse.java index d5055e1be20..f3a0a2349ad 100644 --- a/Mage.Sets/src/mage/cards/g/GravebornMuse.java +++ b/Mage.Sets/src/mage/cards/g/GravebornMuse.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Gravecrawler.java b/Mage.Sets/src/mage/cards/g/Gravecrawler.java index 3c0cfc10eaa..1412ae8bb1e 100644 --- a/Mage.Sets/src/mage/cards/g/Gravecrawler.java +++ b/Mage.Sets/src/mage/cards/g/Gravecrawler.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; @@ -37,9 +35,7 @@ import mage.abilities.effects.AsThoughEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.Duration; -import mage.constants.Outcome; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/g/Gravedigger.java b/Mage.Sets/src/mage/cards/g/Gravedigger.java index 88fc9d9a064..07e0b38eb2a 100644 --- a/Mage.Sets/src/mage/cards/g/Gravedigger.java +++ b/Mage.Sets/src/mage/cards/g/Gravedigger.java @@ -28,17 +28,18 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/Gravegouger.java b/Mage.Sets/src/mage/cards/g/Gravegouger.java index 01d53eea372..d4cdc373741 100644 --- a/Mage.Sets/src/mage/cards/g/Gravegouger.java +++ b/Mage.Sets/src/mage/cards/g/Gravegouger.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInASingleGraveyard; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GravelSlinger.java b/Mage.Sets/src/mage/cards/g/GravelSlinger.java index 9b5517b14a4..9276a9660f6 100644 --- a/Mage.Sets/src/mage/cards/g/GravelSlinger.java +++ b/Mage.Sets/src/mage/cards/g/GravelSlinger.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GravelgillAxeshark.java b/Mage.Sets/src/mage/cards/g/GravelgillAxeshark.java index 918e703377b..7630c384af2 100644 --- a/Mage.Sets/src/mage/cards/g/GravelgillAxeshark.java +++ b/Mage.Sets/src/mage/cards/g/GravelgillAxeshark.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GravelgillDuo.java b/Mage.Sets/src/mage/cards/g/GravelgillDuo.java index 00ca7e80979..35b63cf592b 100644 --- a/Mage.Sets/src/mage/cards/g/GravelgillDuo.java +++ b/Mage.Sets/src/mage/cards/g/GravelgillDuo.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -38,9 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GravenCairns.java b/Mage.Sets/src/mage/cards/g/GravenCairns.java index a87fb09f52a..aa7892ea5a9 100644 --- a/Mage.Sets/src/mage/cards/g/GravenCairns.java +++ b/Mage.Sets/src/mage/cards/g/GravenCairns.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,8 +34,11 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GravenDominator.java b/Mage.Sets/src/mage/cards/g/GravenDominator.java index dbc7e61c6ac..952b0c52fb4 100644 --- a/Mage.Sets/src/mage/cards/g/GravenDominator.java +++ b/Mage.Sets/src/mage/cards/g/GravenDominator.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.common.continuous.SetPowerToughnessAllEffect; @@ -40,6 +39,8 @@ import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Gravepurge.java b/Mage.Sets/src/mage/cards/g/Gravepurge.java index 07b85111184..7f684a4180e 100644 --- a/Mage.Sets/src/mage/cards/g/Gravepurge.java +++ b/Mage.Sets/src/mage/cards/g/Gravepurge.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GraverobberSpider.java b/Mage.Sets/src/mage/cards/g/GraverobberSpider.java index 01c5d92c16c..546f4f93ff7 100644 --- a/Mage.Sets/src/mage/cards/g/GraverobberSpider.java +++ b/Mage.Sets/src/mage/cards/g/GraverobberSpider.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -43,6 +42,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java b/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java index 73ec30086c0..dab0b98335b 100644 --- a/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java +++ b/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/Gravestorm.java b/Mage.Sets/src/mage/cards/g/Gravestorm.java index 179d78d76f8..15be2d62320 100644 --- a/Mage.Sets/src/mage/cards/g/Gravestorm.java +++ b/Mage.Sets/src/mage/cards/g/Gravestorm.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/GravetillerWurm.java b/Mage.Sets/src/mage/cards/g/GravetillerWurm.java index 2e2f0d3c3cf..39f329081ee 100644 --- a/Mage.Sets/src/mage/cards/g/GravetillerWurm.java +++ b/Mage.Sets/src/mage/cards/g/GravetillerWurm.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.MorbidCondition; @@ -37,8 +35,11 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GraveyardShovel.java b/Mage.Sets/src/mage/cards/g/GraveyardShovel.java index bc9162be1e3..aaff96109c9 100644 --- a/Mage.Sets/src/mage/cards/g/GraveyardShovel.java +++ b/Mage.Sets/src/mage/cards/g/GraveyardShovel.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,6 +35,9 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/g/GravitationalShift.java b/Mage.Sets/src/mage/cards/g/GravitationalShift.java index 51c90a5d20b..da9e6e3c7ca 100644 --- a/Mage.Sets/src/mage/cards/g/GravitationalShift.java +++ b/Mage.Sets/src/mage/cards/g/GravitationalShift.java @@ -27,19 +27,20 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GravityNegator.java b/Mage.Sets/src/mage/cards/g/GravityNegator.java index 8295039662e..77b9aa9628f 100644 --- a/Mage.Sets/src/mage/cards/g/GravityNegator.java +++ b/Mage.Sets/src/mage/cards/g/GravityNegator.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GravitySphere.java b/Mage.Sets/src/mage/cards/g/GravitySphere.java index 49e8f6c4f02..7aa0065600d 100644 --- a/Mage.Sets/src/mage/cards/g/GravitySphere.java +++ b/Mage.Sets/src/mage/cards/g/GravitySphere.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.LoseAbilityAllEffect; import mage.abilities.keyword.FlyingAbility; @@ -35,9 +34,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -46,7 +48,7 @@ public class GravitySphere extends CardImpl { public GravitySphere(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // All creatures lose flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LoseAbilityAllEffect(new FilterCreaturePermanent("All creatures"), FlyingAbility.getInstance(), Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/g/GrayOgre.java b/Mage.Sets/src/mage/cards/g/GrayOgre.java index 84034bb4f8b..e77c5dfc2fa 100644 --- a/Mage.Sets/src/mage/cards/g/GrayOgre.java +++ b/Mage.Sets/src/mage/cards/g/GrayOgre.java @@ -27,11 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GraypeltHunter.java b/Mage.Sets/src/mage/cards/g/GraypeltHunter.java index 73c9587ee4f..ec05e2e0285 100644 --- a/Mage.Sets/src/mage/cards/g/GraypeltHunter.java +++ b/Mage.Sets/src/mage/cards/g/GraypeltHunter.java @@ -27,16 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GraypeltRefuge.java b/Mage.Sets/src/mage/cards/g/GraypeltRefuge.java index 5580141ec5d..a9de3921b52 100644 --- a/Mage.Sets/src/mage/cards/g/GraypeltRefuge.java +++ b/Mage.Sets/src/mage/cards/g/GraypeltRefuge.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +34,9 @@ import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrayscaledGharial.java b/Mage.Sets/src/mage/cards/g/GrayscaledGharial.java index e96eaa0d0be..62111639b76 100644 --- a/Mage.Sets/src/mage/cards/g/GrayscaledGharial.java +++ b/Mage.Sets/src/mage/cards/g/GrayscaledGharial.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrazingGladehart.java b/Mage.Sets/src/mage/cards/g/GrazingGladehart.java index a464d7e645d..d1bf89a9a28 100644 --- a/Mage.Sets/src/mage/cards/g/GrazingGladehart.java +++ b/Mage.Sets/src/mage/cards/g/GrazingGladehart.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrazingKelpie.java b/Mage.Sets/src/mage/cards/g/GrazingKelpie.java index 0be2a4c5615..b5774fd5097 100644 --- a/Mage.Sets/src/mage/cards/g/GrazingKelpie.java +++ b/Mage.Sets/src/mage/cards/g/GrazingKelpie.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GreatDefender.java b/Mage.Sets/src/mage/cards/g/GreatDefender.java index 73f498fed63..ef1f55a4f42 100644 --- a/Mage.Sets/src/mage/cards/g/GreatDefender.java +++ b/Mage.Sets/src/mage/cards/g/GreatDefender.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.dynamicvalue.common.TargetConvertedManaCost; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GreatFurnace.java b/Mage.Sets/src/mage/cards/g/GreatFurnace.java index d33689b19a8..970a320a847 100644 --- a/Mage.Sets/src/mage/cards/g/GreatFurnace.java +++ b/Mage.Sets/src/mage/cards/g/GreatFurnace.java @@ -28,11 +28,12 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GreatHart.java b/Mage.Sets/src/mage/cards/g/GreatHart.java index 47d57675ef4..ad8bb00d982 100644 --- a/Mage.Sets/src/mage/cards/g/GreatHart.java +++ b/Mage.Sets/src/mage/cards/g/GreatHart.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GreatHornKrushok.java b/Mage.Sets/src/mage/cards/g/GreatHornKrushok.java index e5c61922567..06436b5a082 100644 --- a/Mage.Sets/src/mage/cards/g/GreatHornKrushok.java +++ b/Mage.Sets/src/mage/cards/g/GreatHornKrushok.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GreatOakGuardian.java b/Mage.Sets/src/mage/cards/g/GreatOakGuardian.java index d0ae4bad2f8..93e4b56f908 100644 --- a/Mage.Sets/src/mage/cards/g/GreatOakGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GreatOakGuardian.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -40,17 +37,17 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GreatSableStag.java b/Mage.Sets/src/mage/cards/g/GreatSableStag.java index 3045ef9ca11..1ba14987d3c 100644 --- a/Mage.Sets/src/mage/cards/g/GreatSableStag.java +++ b/Mage.Sets/src/mage/cards/g/GreatSableStag.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +35,10 @@ import mage.abilities.effects.common.CantBeCounteredSourceEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GreatTeachersDecree.java b/Mage.Sets/src/mage/cards/g/GreatTeachersDecree.java index 286f1f4329b..bb82444acfb 100644 --- a/Mage.Sets/src/mage/cards/g/GreatTeachersDecree.java +++ b/Mage.Sets/src/mage/cards/g/GreatTeachersDecree.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GreatWhale.java b/Mage.Sets/src/mage/cards/g/GreatWhale.java index 2ad5b9ab31e..9446a9f79a7 100644 --- a/Mage.Sets/src/mage/cards/g/GreatWhale.java +++ b/Mage.Sets/src/mage/cards/g/GreatWhale.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.UntapLandsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java index 5a69f31ba3f..7ca415b5d25 100644 --- a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -36,11 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -50,6 +45,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java b/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java index 29d87233d1b..54108be03b6 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java +++ b/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.ShroudAbility; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GreaterBasilisk.java b/Mage.Sets/src/mage/cards/g/GreaterBasilisk.java index 6283097e08c..7fba6bff01f 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterBasilisk.java +++ b/Mage.Sets/src/mage/cards/g/GreaterBasilisk.java @@ -28,12 +28,13 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GreaterForgeling.java b/Mage.Sets/src/mage/cards/g/GreaterForgeling.java index f6dfce92360..0b8e2dc243e 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterForgeling.java +++ b/Mage.Sets/src/mage/cards/g/GreaterForgeling.java @@ -27,18 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GreaterGargadon.java b/Mage.Sets/src/mage/cards/g/GreaterGargadon.java index 36f4e80dfa6..e8510393d6f 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterGargadon.java +++ b/Mage.Sets/src/mage/cards/g/GreaterGargadon.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,6 +36,7 @@ import mage.abilities.keyword.SuspendAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; @@ -47,6 +45,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GreaterGood.java b/Mage.Sets/src/mage/cards/g/GreaterGood.java index c91bade6c7f..b714b85454d 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterGood.java +++ b/Mage.Sets/src/mage/cards/g/GreaterGood.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GreaterHarvester.java b/Mage.Sets/src/mage/cards/g/GreaterHarvester.java index dcb5e5a2cd9..57d310f0d20 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterHarvester.java +++ b/Mage.Sets/src/mage/cards/g/GreaterHarvester.java @@ -5,7 +5,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -25,6 +24,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author wanderer120 diff --git a/Mage.Sets/src/mage/cards/g/GreaterKraytDragon.java b/Mage.Sets/src/mage/cards/g/GreaterKraytDragon.java index ef76ebf8b9b..8777d7285c4 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterKraytDragon.java +++ b/Mage.Sets/src/mage/cards/g/GreaterKraytDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersCount; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GreaterMossdog.java b/Mage.Sets/src/mage/cards/g/GreaterMossdog.java index dffacd3acb4..083f5a2cda2 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterMossdog.java +++ b/Mage.Sets/src/mage/cards/g/GreaterMossdog.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java b/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java index 8e4f9cdbb1e..ac88e12ba5d 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java +++ b/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -48,6 +47,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Greatsword.java b/Mage.Sets/src/mage/cards/g/Greatsword.java index 523459530bd..3311ac14279 100644 --- a/Mage.Sets/src/mage/cards/g/Greatsword.java +++ b/Mage.Sets/src/mage/cards/g/Greatsword.java @@ -28,18 +28,18 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; 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.Outcome; import mage.constants.Zone; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/Greed.java b/Mage.Sets/src/mage/cards/g/Greed.java index 0ab68a136a5..64c06fd9c79 100644 --- a/Mage.Sets/src/mage/cards/g/Greed.java +++ b/Mage.Sets/src/mage/cards/g/Greed.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Greedo.java b/Mage.Sets/src/mage/cards/g/Greedo.java index a6d664d3cd1..2f03867cdc2 100644 --- a/Mage.Sets/src/mage/cards/g/Greedo.java +++ b/Mage.Sets/src/mage/cards/g/Greedo.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; @@ -47,6 +47,8 @@ import mage.filter.predicate.permanent.BlockedByIdPredicate; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author Styxo @@ -62,7 +64,7 @@ public class Greedo extends CardImpl { public Greedo(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Rodian"); this.subtype.add("Hunter"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/g/GreelMindRaker.java b/Mage.Sets/src/mage/cards/g/GreelMindRaker.java index 5b610e93551..a27293dcbbc 100644 --- a/Mage.Sets/src/mage/cards/g/GreelMindRaker.java +++ b/Mage.Sets/src/mage/cards/g/GreelMindRaker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +37,12 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Styxo @@ -50,7 +52,7 @@ public class GreelMindRaker extends CardImpl { public GreelMindRaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Horror"); this.subtype.add("Spellshaper"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GreelsCaress.java b/Mage.Sets/src/mage/cards/g/GreelsCaress.java index 2ad1e4688e2..be446c4422e 100644 --- a/Mage.Sets/src/mage/cards/g/GreelsCaress.java +++ b/Mage.Sets/src/mage/cards/g/GreelsCaress.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -43,6 +42,8 @@ import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GreenScarab.java b/Mage.Sets/src/mage/cards/g/GreenScarab.java index 23de1d89e4b..d58e7dd3480 100644 --- a/Mage.Sets/src/mage/cards/g/GreenScarab.java +++ b/Mage.Sets/src/mage/cards/g/GreenScarab.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,17 +39,15 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Zeplar1_at_googlemail.com diff --git a/Mage.Sets/src/mage/cards/g/GreenSunsZenith.java b/Mage.Sets/src/mage/cards/g/GreenSunsZenith.java index 2c98d38df55..aa5d9d709a3 100644 --- a/Mage.Sets/src/mage/cards/g/GreenSunsZenith.java +++ b/Mage.Sets/src/mage/cards/g/GreenSunsZenith.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.ShuffleSpellEffect; import mage.abilities.effects.common.search.SearchLibraryWithLessCMCPutInPlayEffect; @@ -38,6 +37,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GreenWard.java b/Mage.Sets/src/mage/cards/g/GreenWard.java index 657c1232397..d5bea2d8910 100644 --- a/Mage.Sets/src/mage/cards/g/GreenWard.java +++ b/Mage.Sets/src/mage/cards/g/GreenWard.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GreenhiltTrainee.java b/Mage.Sets/src/mage/cards/g/GreenhiltTrainee.java index 636fe3183a2..9becf900cf4 100644 --- a/Mage.Sets/src/mage/cards/g/GreenhiltTrainee.java +++ b/Mage.Sets/src/mage/cards/g/GreenhiltTrainee.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,12 +37,15 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/Greenseeker.java b/Mage.Sets/src/mage/cards/g/Greenseeker.java index 2153953fd2a..49bcb976926 100644 --- a/Mage.Sets/src/mage/cards/g/Greenseeker.java +++ b/Mage.Sets/src/mage/cards/g/Greenseeker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GreensideWatcher.java b/Mage.Sets/src/mage/cards/g/GreensideWatcher.java index 4d0bb31b1dd..f5ec8657168 100644 --- a/Mage.Sets/src/mage/cards/g/GreensideWatcher.java +++ b/Mage.Sets/src/mage/cards/g/GreensideWatcher.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,11 +34,14 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GreenwardenOfMurasa.java b/Mage.Sets/src/mage/cards/g/GreenwardenOfMurasa.java index 54eb44fa38a..f60dc6a0311 100644 --- a/Mage.Sets/src/mage/cards/g/GreenwardenOfMurasa.java +++ b/Mage.Sets/src/mage/cards/g/GreenwardenOfMurasa.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -48,6 +47,8 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GreenweaverDruid.java b/Mage.Sets/src/mage/cards/g/GreenweaverDruid.java index 6f380f8cdf0..b4eff08ea82 100644 --- a/Mage.Sets/src/mage/cards/g/GreenweaverDruid.java +++ b/Mage.Sets/src/mage/cards/g/GreenweaverDruid.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GremlinInfestation.java b/Mage.Sets/src/mage/cards/g/GremlinInfestation.java index 6aae9b9f781..a27d0c43809 100644 --- a/Mage.Sets/src/mage/cards/g/GremlinInfestation.java +++ b/Mage.Sets/src/mage/cards/g/GremlinInfestation.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.token.GremlinToken; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GremlinMine.java b/Mage.Sets/src/mage/cards/g/GremlinMine.java index 6ae4168bec9..5af6e389faa 100644 --- a/Mage.Sets/src/mage/cards/g/GremlinMine.java +++ b/Mage.Sets/src/mage/cards/g/GremlinMine.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -42,6 +38,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; @@ -51,6 +50,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java b/Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java index 2e48c23d94c..f40be9c3864 100644 --- a/Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java +++ b/Mage.Sets/src/mage/cards/g/GrenzoDungeonWarden.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -40,12 +39,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 @@ -54,7 +56,7 @@ public class GrenzoDungeonWarden extends CardImpl { public GrenzoDungeonWarden(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{X}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/cards/g/GrenzosCutthroat.java b/Mage.Sets/src/mage/cards/g/GrenzosCutthroat.java index 5374b57497a..e92a56e281a 100644 --- a/Mage.Sets/src/mage/cards/g/GrenzosCutthroat.java +++ b/Mage.Sets/src/mage/cards/g/GrenzosCutthroat.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.DethroneAbility; +import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GridMonitor.java b/Mage.Sets/src/mage/cards/g/GridMonitor.java index bc2aee4dd2e..d86b94da345 100644 --- a/Mage.Sets/src/mage/cards/g/GridMonitor.java +++ b/Mage.Sets/src/mage/cards/g/GridMonitor.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Gridlock.java b/Mage.Sets/src/mage/cards/g/Gridlock.java index 6e062bf0edf..d36336c682d 100644 --- a/Mage.Sets/src/mage/cards/g/Gridlock.java +++ b/Mage.Sets/src/mage/cards/g/Gridlock.java @@ -27,17 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GriefTyrant.java b/Mage.Sets/src/mage/cards/g/GriefTyrant.java index 180849399b7..c6121531d72 100644 --- a/Mage.Sets/src/mage/cards/g/GriefTyrant.java +++ b/Mage.Sets/src/mage/cards/g/GriefTyrant.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GriffinCanyon.java b/Mage.Sets/src/mage/cards/g/GriffinCanyon.java index 8811ef3a898..98f83d1b4fa 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinCanyon.java +++ b/Mage.Sets/src/mage/cards/g/GriffinCanyon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author anonymous diff --git a/Mage.Sets/src/mage/cards/g/GriffinDreamfinder.java b/Mage.Sets/src/mage/cards/g/GriffinDreamfinder.java index e34fbf8bd4c..fdf04ae3f5f 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinDreamfinder.java +++ b/Mage.Sets/src/mage/cards/g/GriffinDreamfinder.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,6 +39,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GriffinGuide.java b/Mage.Sets/src/mage/cards/g/GriffinGuide.java index 5ba5b307448..a470b375a4b 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinGuide.java +++ b/Mage.Sets/src/mage/cards/g/GriffinGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -40,15 +39,13 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GriffinProtector.java b/Mage.Sets/src/mage/cards/g/GriffinProtector.java index d743791c1ce..f6a9af33f45 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinProtector.java +++ b/Mage.Sets/src/mage/cards/g/GriffinProtector.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GriffinRider.java b/Mage.Sets/src/mage/cards/g/GriffinRider.java index 77e7a6ffad8..78efcb34017 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinRider.java +++ b/Mage.Sets/src/mage/cards/g/GriffinRider.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -40,11 +36,15 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author nantuko diff --git a/Mage.Sets/src/mage/cards/g/GriffinSentinel.java b/Mage.Sets/src/mage/cards/g/GriffinSentinel.java index dafbbf8a156..7125d5efa24 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinSentinel.java +++ b/Mage.Sets/src/mage/cards/g/GriffinSentinel.java @@ -28,14 +28,14 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GrimAffliction.java b/Mage.Sets/src/mage/cards/g/GrimAffliction.java index f4a3425c520..f7c70e2fe15 100644 --- a/Mage.Sets/src/mage/cards/g/GrimAffliction.java +++ b/Mage.Sets/src/mage/cards/g/GrimAffliction.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GrimBackwoods.java b/Mage.Sets/src/mage/cards/g/GrimBackwoods.java index fdbf0dff745..6fdadcb1768 100644 --- a/Mage.Sets/src/mage/cards/g/GrimBackwoods.java +++ b/Mage.Sets/src/mage/cards/g/GrimBackwoods.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,8 +36,12 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GrimContest.java b/Mage.Sets/src/mage/cards/g/GrimContest.java index 65301ef86d9..51dfa810056 100644 --- a/Mage.Sets/src/mage/cards/g/GrimContest.java +++ b/Mage.Sets/src/mage/cards/g/GrimContest.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -43,6 +42,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrimDiscovery.java b/Mage.Sets/src/mage/cards/g/GrimDiscovery.java index f9ffc7afe10..ba8e9dac2b3 100644 --- a/Mage.Sets/src/mage/cards/g/GrimDiscovery.java +++ b/Mage.Sets/src/mage/cards/g/GrimDiscovery.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.abilities.Mode; -import mage.abilities.effects.common.ReturnToHandTargetEffect; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.filter.common.FilterCreatureCard; -import mage.filter.common.FilterLandCard; -import mage.target.common.TargetCardInYourGraveyard; + import mage.abilities.Mode; + import mage.abilities.effects.common.ReturnToHandTargetEffect; + import mage.cards.CardImpl; + import mage.cards.CardSetInfo; + import mage.constants.CardType; + import mage.filter.common.FilterCreatureCard; + import mage.filter.common.FilterLandCard; + import mage.target.common.TargetCardInYourGraveyard; + + import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrimFlayer.java b/Mage.Sets/src/mage/cards/g/GrimFlayer.java index c72ef0bed15..d4b7c882c85 100644 --- a/Mage.Sets/src/mage/cards/g/GrimFlayer.java +++ b/Mage.Sets/src/mage/cards/g/GrimFlayer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterCard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrimFlowering.java b/Mage.Sets/src/mage/cards/g/GrimFlowering.java index d45edf6c2fb..d1550e421b8 100644 --- a/Mage.Sets/src/mage/cards/g/GrimFlowering.java +++ b/Mage.Sets/src/mage/cards/g/GrimFlowering.java @@ -27,14 +27,15 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GrimGuardian.java b/Mage.Sets/src/mage/cards/g/GrimGuardian.java index f1d2fd399dd..e0266a4b149 100644 --- a/Mage.Sets/src/mage/cards/g/GrimGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GrimGuardian.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.ConstellationAbility; import mage.abilities.effects.common.LoseLifeOpponentsEffect; @@ -35,6 +34,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java index b8c5d4372e2..d00e0134d3e 100644 --- a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java +++ b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.costs.mana.ColoredManaCost; @@ -44,6 +43,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GrimHarvest.java b/Mage.Sets/src/mage/cards/g/GrimHarvest.java index 4ed7a3d4137..4cff64ba349 100644 --- a/Mage.Sets/src/mage/cards/g/GrimHarvest.java +++ b/Mage.Sets/src/mage/cards/g/GrimHarvest.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.RecoverAbility; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrimLavamancer.java b/Mage.Sets/src/mage/cards/g/GrimLavamancer.java index 4a9bf06e224..d17765eaad5 100644 --- a/Mage.Sets/src/mage/cards/g/GrimLavamancer.java +++ b/Mage.Sets/src/mage/cards/g/GrimLavamancer.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +36,15 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GrimMonolith.java b/Mage.Sets/src/mage/cards/g/GrimMonolith.java index 4ac35306b63..f85966b3a05 100644 --- a/Mage.Sets/src/mage/cards/g/GrimMonolith.java +++ b/Mage.Sets/src/mage/cards/g/GrimMonolith.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.Mana; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,8 +37,11 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GrimPoppet.java b/Mage.Sets/src/mage/cards/g/GrimPoppet.java index 7c25f31ac49..07212b13a0d 100644 --- a/Mage.Sets/src/mage/cards/g/GrimPoppet.java +++ b/Mage.Sets/src/mage/cards/g/GrimPoppet.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GrimReturn.java b/Mage.Sets/src/mage/cards/g/GrimReturn.java index d0beb3739f2..b9e8664047b 100644 --- a/Mage.Sets/src/mage/cards/g/GrimReturn.java +++ b/Mage.Sets/src/mage/cards/g/GrimReturn.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.Effect; @@ -45,6 +42,10 @@ import mage.game.Game; import mage.target.common.TargetCardInGraveyard; import mage.watchers.common.CardsPutIntoGraveyardWatcher; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrimRoustabout.java b/Mage.Sets/src/mage/cards/g/GrimRoustabout.java index 3917a6986c2..f32001b58a2 100644 --- a/Mage.Sets/src/mage/cards/g/GrimRoustabout.java +++ b/Mage.Sets/src/mage/cards/g/GrimRoustabout.java @@ -26,10 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ package mage.cards.g; - -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; + import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,6 +34,10 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.UnleashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrimTutor.java b/Mage.Sets/src/mage/cards/g/GrimTutor.java index def87372790..3027ddca877 100644 --- a/Mage.Sets/src/mage/cards/g/GrimTutor.java +++ b/Mage.Sets/src/mage/cards/g/GrimTutor.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; @@ -35,6 +34,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GrimclawBats.java b/Mage.Sets/src/mage/cards/g/GrimclawBats.java index 9a7aa4f7e28..23191e59925 100644 --- a/Mage.Sets/src/mage/cards/g/GrimclawBats.java +++ b/Mage.Sets/src/mage/cards/g/GrimclawBats.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +37,12 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java b/Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java index 489dd029740..70f5cd9a8d2 100644 --- a/Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java +++ b/Mage.Sets/src/mage/cards/g/GrimgrinCorpseBorn.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -53,6 +53,8 @@ import mage.game.events.GameEvent.EventType; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North @@ -66,7 +68,7 @@ public class GrimgrinCorpseBorn extends CardImpl { public GrimgrinCorpseBorn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/g/GrimoireOfTheDead.java b/Mage.Sets/src/mage/cards/g/GrimoireOfTheDead.java index 9217cef674e..30e853f606e 100644 --- a/Mage.Sets/src/mage/cards/g/GrimoireOfTheDead.java +++ b/Mage.Sets/src/mage/cards/g/GrimoireOfTheDead.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; @@ -43,18 +40,17 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author BetaSteward @@ -63,7 +59,7 @@ public class GrimoireOfTheDead extends CardImpl { public GrimoireOfTheDead(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {1}, {tap}, Discard a card: Put a study counter on Grimoire of the Dead. Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STUDY.createInstance()), new ManaCostsImpl("{1}")); diff --git a/Mage.Sets/src/mage/cards/g/GrimoireThief.java b/Mage.Sets/src/mage/cards/g/GrimoireThief.java index 538f528b053..d40fafdb801 100644 --- a/Mage.Sets/src/mage/cards/g/GrimoireThief.java +++ b/Mage.Sets/src/mage/cards/g/GrimoireThief.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -41,17 +37,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.cards.CardSetInfo; -import mage.cards.SplitCard; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.game.ExileZone; import mage.game.Game; import mage.game.stack.Spell; @@ -60,6 +47,11 @@ import mage.players.Player; import mage.target.common.TargetOpponent; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/Grindclock.java b/Mage.Sets/src/mage/cards/g/Grindclock.java index 8a3acf2e2c8..47a5ef90d08 100644 --- a/Mage.Sets/src/mage/cards/g/Grindclock.java +++ b/Mage.Sets/src/mage/cards/g/Grindclock.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GrindingStation.java b/Mage.Sets/src/mage/cards/g/GrindingStation.java index aa3f9614ed0..ed55c09eaf9 100644 --- a/Mage.Sets/src/mage/cards/g/GrindingStation.java +++ b/Mage.Sets/src/mage/cards/g/GrindingStation.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,12 +36,16 @@ import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Grindstone.java b/Mage.Sets/src/mage/cards/g/Grindstone.java index c42aef233cb..acba996ba8e 100644 --- a/Mage.Sets/src/mage/cards/g/Grindstone.java +++ b/Mage.Sets/src/mage/cards/g/Grindstone.java @@ -27,17 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -45,6 +40,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrinningDemon.java b/Mage.Sets/src/mage/cards/g/GrinningDemon.java index 8ac9858356a..c3b046562c5 100644 --- a/Mage.Sets/src/mage/cards/g/GrinningDemon.java +++ b/Mage.Sets/src/mage/cards/g/GrinningDemon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GrinningIgnus.java b/Mage.Sets/src/mage/cards/g/GrinningIgnus.java index 225cc96eb2a..8e203144e78 100644 --- a/Mage.Sets/src/mage/cards/g/GrinningIgnus.java +++ b/Mage.Sets/src/mage/cards/g/GrinningIgnus.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrinningTotem.java b/Mage.Sets/src/mage/cards/g/GrinningTotem.java index 5738d938044..93c4440eb66 100644 --- a/Mage.Sets/src/mage/cards/g/GrinningTotem.java +++ b/Mage.Sets/src/mage/cards/g/GrinningTotem.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -41,12 +40,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.Zone; +import mage.constants.*; import mage.game.ExileZone; import mage.game.Game; import mage.game.events.GameEvent; @@ -57,6 +51,8 @@ import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Quercitron diff --git a/Mage.Sets/src/mage/cards/g/GripOfChaos.java b/Mage.Sets/src/mage/cards/g/GripOfChaos.java index 545f620cbac..3c8617e1d6a 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfChaos.java +++ b/Mage.Sets/src/mage/cards/g/GripOfChaos.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.Iterator; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbilityImpl; @@ -48,6 +45,10 @@ import mage.target.Target; import mage.target.targetpointer.FixedTarget; import mage.util.RandomUtil; +import java.util.Iterator; +import java.util.Set; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/GripOfDesolation.java b/Mage.Sets/src/mage/cards/g/GripOfDesolation.java index 74c1ab19377..27e0a034910 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfDesolation.java +++ b/Mage.Sets/src/mage/cards/g/GripOfDesolation.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetEffect; @@ -39,6 +38,8 @@ import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; import mage.target.targetpointer.SecondTargetPointer; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java b/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java index 47f1264f5b5..2af84b5d35b 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java +++ b/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/g/GripOfTheRoil.java b/Mage.Sets/src/mage/cards/g/GripOfTheRoil.java index c157d08016f..53dc25ea23e 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfTheRoil.java +++ b/Mage.Sets/src/mage/cards/g/GripOfTheRoil.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.TapTargetEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Griptide.java b/Mage.Sets/src/mage/cards/g/Griptide.java index 0ccd9fe416a..54cf1f89425 100644 --- a/Mage.Sets/src/mage/cards/g/Griptide.java +++ b/Mage.Sets/src/mage/cards/g/Griptide.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/Griselbrand.java b/Mage.Sets/src/mage/cards/g/Griselbrand.java index 291174c098a..e6ec0acdd09 100644 --- a/Mage.Sets/src/mage/cards/g/Griselbrand.java +++ b/Mage.Sets/src/mage/cards/g/Griselbrand.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; @@ -38,8 +35,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki @@ -48,7 +49,7 @@ public class Griselbrand extends CardImpl { public Griselbrand(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java b/Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java index 798d4254dde..6223e7c0da9 100644 --- a/Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java +++ b/Mage.Sets/src/mage/cards/g/GrislyAnglerfish.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrislySalvage.java b/Mage.Sets/src/mage/cards/g/GrislySalvage.java index 93a388c1328..6f9322715db 100644 --- a/Mage.Sets/src/mage/cards/g/GrislySalvage.java +++ b/Mage.Sets/src/mage/cards/g/GrislySalvage.java @@ -27,15 +27,10 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -46,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrislySpectacle.java b/Mage.Sets/src/mage/cards/g/GrislySpectacle.java index be461dde636..8bf2f28817c 100644 --- a/Mage.Sets/src/mage/cards/g/GrislySpectacle.java +++ b/Mage.Sets/src/mage/cards/g/GrislySpectacle.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -46,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GrislyTransformation.java b/Mage.Sets/src/mage/cards/g/GrislyTransformation.java index 8811166182b..10bd8c2c1d6 100644 --- a/Mage.Sets/src/mage/cards/g/GrislyTransformation.java +++ b/Mage.Sets/src/mage/cards/g/GrislyTransformation.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -38,14 +37,12 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GristleGrinner.java b/Mage.Sets/src/mage/cards/g/GristleGrinner.java index cb96fad59f4..fc6d9a927b2 100644 --- a/Mage.Sets/src/mage/cards/g/GristleGrinner.java +++ b/Mage.Sets/src/mage/cards/g/GristleGrinner.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/Gristleback.java b/Mage.Sets/src/mage/cards/g/Gristleback.java index a63ef91af5f..93987f6bd9c 100644 --- a/Mage.Sets/src/mage/cards/g/Gristleback.java +++ b/Mage.Sets/src/mage/cards/g/Gristleback.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/GrixisBattlemage.java b/Mage.Sets/src/mage/cards/g/GrixisBattlemage.java index 48e2607e045..5a21ad94de3 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisBattlemage.java +++ b/Mage.Sets/src/mage/cards/g/GrixisBattlemage.java @@ -27,22 +27,22 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.abilities.effects.common.DrawDiscardControllerEffect; +import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GrixisCharm.java b/Mage.Sets/src/mage/cards/g/GrixisCharm.java index 9a28611229e..b9593357cab 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisCharm.java +++ b/Mage.Sets/src/mage/cards/g/GrixisCharm.java @@ -27,19 +27,20 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.Mode; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java index 2423bd3aa5d..5e4059f3b48 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java +++ b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GrixisIllusionist.java b/Mage.Sets/src/mage/cards/g/GrixisIllusionist.java index cd2829e6638..b496817eda2 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisIllusionist.java +++ b/Mage.Sets/src/mage/cards/g/GrixisIllusionist.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GrixisPanorama.java b/Mage.Sets/src/mage/cards/g/GrixisPanorama.java index 768d3d98c48..f007789d87c 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisPanorama.java +++ b/Mage.Sets/src/mage/cards/g/GrixisPanorama.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +36,9 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GrixisSlavedriver.java b/Mage.Sets/src/mage/cards/g/GrixisSlavedriver.java index 42a26885e7f..0c245369ab6 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisSlavedriver.java +++ b/Mage.Sets/src/mage/cards/g/GrixisSlavedriver.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GrixisSojourners.java b/Mage.Sets/src/mage/cards/g/GrixisSojourners.java index e1081b1b238..ba33dfe4f48 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisSojourners.java +++ b/Mage.Sets/src/mage/cards/g/GrixisSojourners.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.target.common.TargetCardInASingleGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GrizzledAngler.java b/Mage.Sets/src/mage/cards/g/GrizzledAngler.java index 0f00a5174d6..6f3f98d0589 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzledAngler.java +++ b/Mage.Sets/src/mage/cards/g/GrizzledAngler.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrizzledLeotau.java b/Mage.Sets/src/mage/cards/g/GrizzledLeotau.java index e5344612798..9588ac8e25c 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzledLeotau.java +++ b/Mage.Sets/src/mage/cards/g/GrizzledLeotau.java @@ -27,11 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrizzledOutcasts.java b/Mage.Sets/src/mage/cards/g/GrizzledOutcasts.java index 940fe85d5f6..ce8a1373439 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzledOutcasts.java +++ b/Mage.Sets/src/mage/cards/g/GrizzledOutcasts.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -35,9 +34,10 @@ import mage.abilities.condition.common.NoSpellsWereCastLastTurnCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.k.KrallenhordeWantons; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.k.KrallenhordeWantons; +import mage.constants.CardType; import mage.constants.TargetController; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GrizzlyBears.java b/Mage.Sets/src/mage/cards/g/GrizzlyBears.java index 2236a1d9345..86d3def04e9 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzlyBears.java +++ b/Mage.Sets/src/mage/cards/g/GrizzlyBears.java @@ -27,11 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrizzlyFate.java b/Mage.Sets/src/mage/cards/g/GrizzlyFate.java index c4d920b6fe5..fedaa286997 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzlyFate.java +++ b/Mage.Sets/src/mage/cards/g/GrizzlyFate.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -40,6 +39,8 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.game.permanent.token.BearToken; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Groffskithur.java b/Mage.Sets/src/mage/cards/g/Groffskithur.java index e84cf758478..b3f4f9fcd2b 100644 --- a/Mage.Sets/src/mage/cards/g/Groffskithur.java +++ b/Mage.Sets/src/mage/cards/g/Groffskithur.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedTriggeredAbility; @@ -39,6 +38,8 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java b/Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java index b34b0438b7e..72eb58893c1 100644 --- a/Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java +++ b/Mage.Sets/src/mage/cards/g/GrotagSiegeRunner.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GrotagThrasher.java b/Mage.Sets/src/mage/cards/g/GrotagThrasher.java index 15ee4e355ba..7169966f2d5 100644 --- a/Mage.Sets/src/mage/cards/g/GrotagThrasher.java +++ b/Mage.Sets/src/mage/cards/g/GrotagThrasher.java @@ -27,17 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java b/Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java index d19e45098e2..6baaabd5c73 100644 --- a/Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java +++ b/Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -45,6 +44,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrotesqueMutation.java b/Mage.Sets/src/mage/cards/g/GrotesqueMutation.java index 3e11cab2567..68eb57c6299 100644 --- a/Mage.Sets/src/mage/cards/g/GrotesqueMutation.java +++ b/Mage.Sets/src/mage/cards/g/GrotesqueMutation.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GroundAssault.java b/Mage.Sets/src/mage/cards/g/GroundAssault.java index 1e8081b9a19..a5dfc711fa3 100644 --- a/Mage.Sets/src/mage/cards/g/GroundAssault.java +++ b/Mage.Sets/src/mage/cards/g/GroundAssault.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GroundRift.java b/Mage.Sets/src/mage/cards/g/GroundRift.java index 5403474bbad..2c545cea11c 100644 --- a/Mage.Sets/src/mage/cards/g/GroundRift.java +++ b/Mage.Sets/src/mage/cards/g/GroundRift.java @@ -27,20 +27,20 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.combat.CantBlockTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GroundSeal.java b/Mage.Sets/src/mage/cards/g/GroundSeal.java index 2a698d5365f..a00512f2951 100644 --- a/Mage.Sets/src/mage/cards/g/GroundSeal.java +++ b/Mage.Sets/src/mage/cards/g/GroundSeal.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +43,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.StackObject; +import java.util.UUID; + /** * @author jeffwadsworth */ diff --git a/Mage.Sets/src/mage/cards/g/Groundbreaker.java b/Mage.Sets/src/mage/cards/g/Groundbreaker.java index 9d6037f89c9..1725bd4665b 100644 --- a/Mage.Sets/src/mage/cards/g/Groundbreaker.java +++ b/Mage.Sets/src/mage/cards/g/Groundbreaker.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/Grounded.java b/Mage.Sets/src/mage/cards/g/Grounded.java index 1692d2fea64..901b9a5e7c5 100644 --- a/Mage.Sets/src/mage/cards/g/Grounded.java +++ b/Mage.Sets/src/mage/cards/g/Grounded.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -36,6 +35,10 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/g/GroundlingPouncer.java b/Mage.Sets/src/mage/cards/g/GroundlingPouncer.java index 7fbc45d40c1..95c7601c40d 100644 --- a/Mage.Sets/src/mage/cards/g/GroundlingPouncer.java +++ b/Mage.Sets/src/mage/cards/g/GroundlingPouncer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; @@ -50,6 +49,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GroundshakerSliver.java b/Mage.Sets/src/mage/cards/g/GroundshakerSliver.java index 68e51292e0b..2ef4137ed31 100644 --- a/Mage.Sets/src/mage/cards/g/GroundshakerSliver.java +++ b/Mage.Sets/src/mage/cards/g/GroundshakerSliver.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Groundskeeper.java b/Mage.Sets/src/mage/cards/g/Groundskeeper.java index ebeac04e5a6..5be3ddee056 100644 --- a/Mage.Sets/src/mage/cards/g/Groundskeeper.java +++ b/Mage.Sets/src/mage/cards/g/Groundskeeper.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,8 @@ import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Groundswell.java b/Mage.Sets/src/mage/cards/g/Groundswell.java index 8aee060d6d8..d63375fced0 100644 --- a/Mage.Sets/src/mage/cards/g/Groundswell.java +++ b/Mage.Sets/src/mage/cards/g/Groundswell.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.condition.common.LandfallCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.AddContinuousEffectToGame; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import mage.watchers.common.LandfallWatcher; +import java.util.UUID; + /** * * @author Viserion diff --git a/Mage.Sets/src/mage/cards/g/GroveRumbler.java b/Mage.Sets/src/mage/cards/g/GroveRumbler.java index 5fc2d177db9..9831f4511e5 100644 --- a/Mage.Sets/src/mage/cards/g/GroveRumbler.java +++ b/Mage.Sets/src/mage/cards/g/GroveRumbler.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -37,6 +36,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java b/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java index fe4827e235b..9fe2351778c 100644 --- a/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java +++ b/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrowingRanks.java b/Mage.Sets/src/mage/cards/g/GrowingRanks.java index 3a0f6bf65a7..049e5acb3e7 100644 --- a/Mage.Sets/src/mage/cards/g/GrowingRanks.java +++ b/Mage.Sets/src/mage/cards/g/GrowingRanks.java @@ -27,17 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.PopulateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * @author LevelX2 */ diff --git a/Mage.Sets/src/mage/cards/g/GrowthSpasm.java b/Mage.Sets/src/mage/cards/g/GrowthSpasm.java index 8bf2f7c0c65..60ad63540d3 100644 --- a/Mage.Sets/src/mage/cards/g/GrowthSpasm.java +++ b/Mage.Sets/src/mage/cards/g/GrowthSpasm.java @@ -27,16 +27,17 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterBasicLandCard; import mage.game.permanent.token.EldraziSpawnToken; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/Grozoth.java b/Mage.Sets/src/mage/cards/g/Grozoth.java index def98cb16b8..5ffb8b50fe4 100644 --- a/Mage.Sets/src/mage/cards/g/Grozoth.java +++ b/Mage.Sets/src/mage/cards/g/Grozoth.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,11 +36,7 @@ import mage.abilities.effects.SearchEffect; import mage.abilities.effects.common.continuous.LoseAbilitySourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.TransmuteAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; @@ -53,6 +48,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java b/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java index 3e54aac95a5..11057b519c2 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -38,9 +35,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Alvin diff --git a/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java b/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java index d791fe8115b..244236b051c 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -46,6 +44,9 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.TargetPlayer; +import java.util.List; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GruesomeEncore.java b/Mage.Sets/src/mage/cards/g/GruesomeEncore.java index 162c5f0259f..7f3d488dfd1 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeEncore.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeEncore.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -51,6 +50,8 @@ import mage.game.events.ZoneChangeEvent; import mage.target.common.TargetCardInOpponentsGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java b/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java index 88085cfc3cc..61a30d61673 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GruulCharm.java b/Mage.Sets/src/mage/cards/g/GruulCharm.java index c174bd326f6..091a3b543c6 100644 --- a/Mage.Sets/src/mage/cards/g/GruulCharm.java +++ b/Mage.Sets/src/mage/cards/g/GruulCharm.java @@ -27,22 +27,24 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Mode; +import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.combat.CantBlockAllEffect; import mage.abilities.effects.common.continuous.GainControlAllEffect; -import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.other.OwnerPredicate; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GruulCluestone.java b/Mage.Sets/src/mage/cards/g/GruulCluestone.java index 4ffb0a5cc56..831da9de553 100644 --- a/Mage.Sets/src/mage/cards/g/GruulCluestone.java +++ b/Mage.Sets/src/mage/cards/g/GruulCluestone.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +38,10 @@ import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GruulGuildgate.java b/Mage.Sets/src/mage/cards/g/GruulGuildgate.java index f825d1849c2..c3e920667f6 100644 --- a/Mage.Sets/src/mage/cards/g/GruulGuildgate.java +++ b/Mage.Sets/src/mage/cards/g/GruulGuildgate.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GruulGuildmage.java b/Mage.Sets/src/mage/cards/g/GruulGuildmage.java index 9f305d3bf7a..9eb476e6b43 100644 --- a/Mage.Sets/src/mage/cards/g/GruulGuildmage.java +++ b/Mage.Sets/src/mage/cards/g/GruulGuildmage.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +36,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; @@ -47,6 +45,8 @@ import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GruulNodorog.java b/Mage.Sets/src/mage/cards/g/GruulNodorog.java index 3ce6d14bbcb..b507162afba 100644 --- a/Mage.Sets/src/mage/cards/g/GruulNodorog.java +++ b/Mage.Sets/src/mage/cards/g/GruulNodorog.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +38,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GruulRagebeast.java b/Mage.Sets/src/mage/cards/g/GruulRagebeast.java index 6531538f6e4..413fc012e6c 100644 --- a/Mage.Sets/src/mage/cards/g/GruulRagebeast.java +++ b/Mage.Sets/src/mage/cards/g/GruulRagebeast.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GruulScrapper.java b/Mage.Sets/src/mage/cards/g/GruulScrapper.java index c2de880a2dc..d690b15734b 100644 --- a/Mage.Sets/src/mage/cards/g/GruulScrapper.java +++ b/Mage.Sets/src/mage/cards/g/GruulScrapper.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ManaWasSpentCondition; @@ -41,6 +40,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.watchers.common.ManaSpentToCastWatcher; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GruulSignet.java b/Mage.Sets/src/mage/cards/g/GruulSignet.java index 9a77c868f40..bc294de22aa 100644 --- a/Mage.Sets/src/mage/cards/g/GruulSignet.java +++ b/Mage.Sets/src/mage/cards/g/GruulSignet.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; @@ -37,8 +34,11 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GruulTurf.java b/Mage.Sets/src/mage/cards/g/GruulTurf.java index f8d6e765830..506e266c1ff 100644 --- a/Mage.Sets/src/mage/cards/g/GruulTurf.java +++ b/Mage.Sets/src/mage/cards/g/GruulTurf.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -41,6 +40,8 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GruulWarChant.java b/Mage.Sets/src/mage/cards/g/GruulWarChant.java index 9f0b2125d3d..45e67e4c33f 100644 --- a/Mage.Sets/src/mage/cards/g/GruulWarChant.java +++ b/Mage.Sets/src/mage/cards/g/GruulWarChant.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -43,6 +42,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java index b6d7350bf72..80fd7f81ee1 100644 --- a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java +++ b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java @@ -27,21 +27,22 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.MageInt; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; -import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; -import mage.abilities.keyword.TrampleAbility; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; -import mage.filter.common.FilterCreaturePermanent; -import mage.game.permanent.token.Token; + import mage.MageInt; + import mage.abilities.common.SimpleActivatedAbility; + import mage.abilities.common.SimpleStaticAbility; + import mage.abilities.costs.mana.ManaCostsImpl; + import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; + import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; + import mage.abilities.keyword.TrampleAbility; + import mage.cards.CardImpl; + import mage.cards.CardSetInfo; + import mage.constants.CardType; + import mage.constants.Duration; + import mage.constants.Zone; + import mage.filter.common.FilterCreaturePermanent; + import mage.game.permanent.token.Token; + + import java.util.UUID; /** * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GryffVanguard.java b/Mage.Sets/src/mage/cards/g/GryffVanguard.java index b460809617c..f9d20f64570 100644 --- a/Mage.Sets/src/mage/cards/g/GryffVanguard.java +++ b/Mage.Sets/src/mage/cards/g/GryffVanguard.java @@ -27,13 +27,13 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GryffsBoon.java b/Mage.Sets/src/mage/cards/g/GryffsBoon.java index a80c666b04f..1b378321e04 100644 --- a/Mage.Sets/src/mage/cards/g/GryffsBoon.java +++ b/Mage.Sets/src/mage/cards/g/GryffsBoon.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -42,16 +41,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -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.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) diff --git a/Mage.Sets/src/mage/cards/g/GuanYuSaintedWarrior.java b/Mage.Sets/src/mage/cards/g/GuanYuSaintedWarrior.java index 96c5320d8b8..f395fdd7aef 100644 --- a/Mage.Sets/src/mage/cards/g/GuanYuSaintedWarrior.java +++ b/Mage.Sets/src/mage/cards/g/GuanYuSaintedWarrior.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; @@ -35,6 +34,9 @@ import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class GuanYuSaintedWarrior extends CardImpl { public GuanYuSaintedWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java b/Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java index 0e359f7c147..1f0046143c1 100644 --- a/Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java +++ b/Mage.Sets/src/mage/cards/g/GuanYus1000LiMarch.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,6 +34,8 @@ import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GuardDuty.java b/Mage.Sets/src/mage/cards/g/GuardDuty.java index b4bcc6cc49f..6c0d25efa24 100644 --- a/Mage.Sets/src/mage/cards/g/GuardDuty.java +++ b/Mage.Sets/src/mage/cards/g/GuardDuty.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -39,9 +36,15 @@ import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GuardGomazoa.java b/Mage.Sets/src/mage/cards/g/GuardGomazoa.java index 1fd6ca4556b..ea4833060af 100644 --- a/Mage.Sets/src/mage/cards/g/GuardGomazoa.java +++ b/Mage.Sets/src/mage/cards/g/GuardGomazoa.java @@ -27,18 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; +import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.PreventCombatDamageToSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.abilities.common.SimpleStaticAbility; -import mage.constants.Zone; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GuardianAngel.java b/Mage.Sets/src/mage/cards/g/GuardianAngel.java index f183f418b98..7b8c26f1d96 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianAngel.java +++ b/Mage.Sets/src/mage/cards/g/GuardianAngel.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.SpecialAction; @@ -50,6 +49,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author MTGfan diff --git a/Mage.Sets/src/mage/cards/g/GuardianAutomaton.java b/Mage.Sets/src/mage/cards/g/GuardianAutomaton.java index 9a2b20b9821..9996ed3829c 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianAutomaton.java +++ b/Mage.Sets/src/mage/cards/g/GuardianAutomaton.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; +import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.common.GainLifeEffect; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GuardianBeast.java b/Mage.Sets/src/mage/cards/g/GuardianBeast.java index 4f30aae14c0..ef0a0fcc57c 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianBeast.java +++ b/Mage.Sets/src/mage/cards/g/GuardianBeast.java @@ -27,8 +27,6 @@ */ package mage.cards.g; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -37,19 +35,19 @@ import mage.abilities.condition.common.SourceTappedCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; +import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Outcome; import mage.constants.Zone; +import mage.filter.FilterObject; +import mage.filter.FilterStackObject; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; -import mage.constants.Outcome; -import mage.filter.FilterObject; -import mage.filter.FilterStackObject; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -57,6 +55,9 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; +import java.util.Objects; +import java.util.UUID; + /** * * @author spjspj diff --git a/Mage.Sets/src/mage/cards/g/GuardianIdol.java b/Mage.Sets/src/mage/cards/g/GuardianIdol.java index e4c23920098..ee314a87456 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianIdol.java +++ b/Mage.Sets/src/mage/cards/g/GuardianIdol.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GuardianLions.java b/Mage.Sets/src/mage/cards/g/GuardianLions.java index a3b0743380f..a3b85979aa0 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianLions.java +++ b/Mage.Sets/src/mage/cards/g/GuardianLions.java @@ -27,12 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java b/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java index d3c2187c2f4..3cddb22e3f9 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfPilgrims.java b/Mage.Sets/src/mage/cards/g/GuardianOfPilgrims.java index 9427a8be5cc..b548ac03766 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfPilgrims.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfPilgrims.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -37,6 +36,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfSolitude.java b/Mage.Sets/src/mage/cards/g/GuardianOfSolitude.java index 5cac7174e7c..d4cd517a261 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfSolitude.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfSolitude.java @@ -28,9 +28,6 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -38,10 +35,13 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfTazeem.java b/Mage.Sets/src/mage/cards/g/GuardianOfTazeem.java index 8ac488e6c52..54b7b2d09ce 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfTazeem.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfTazeem.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -51,6 +50,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfTheAges.java b/Mage.Sets/src/mage/cards/g/GuardianOfTheAges.java index 0f53216b5af..3b662d0a7ce 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfTheAges.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfTheAges.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -46,6 +45,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Noahsark diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfVituGhazi.java b/Mage.Sets/src/mage/cards/g/GuardianOfVituGhazi.java index 250af724e62..a1242990c8e 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfVituGhazi.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfVituGhazi.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GuardianSeraph.java b/Mage.Sets/src/mage/cards/g/GuardianSeraph.java index eed36159d0d..ff0ee376810 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianSeraph.java +++ b/Mage.Sets/src/mage/cards/g/GuardianSeraph.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -38,9 +34,14 @@ import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java index 22f57a3f622..f302d0fd428 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java +++ b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java index 24d121fd931..88dc8def3c7 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java +++ b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -41,10 +38,16 @@ import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java index dbfcefa2bcc..a87eaa0ec7f 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -36,17 +35,15 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Markedagain diff --git a/Mage.Sets/src/mage/cards/g/GuardiansOfAkrasa.java b/Mage.Sets/src/mage/cards/g/GuardiansOfAkrasa.java index d23fa618499..34ce262a2c2 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansOfAkrasa.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansOfAkrasa.java @@ -28,13 +28,14 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GuardiansOfMeletis.java b/Mage.Sets/src/mage/cards/g/GuardiansOfMeletis.java index 77255a04457..d5b412bf7dc 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansOfMeletis.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansOfMeletis.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GuardiansPledge.java b/Mage.Sets/src/mage/cards/g/GuardiansPledge.java index 02fd123d1c8..5172e9016f4 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansPledge.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansPledge.java @@ -28,17 +28,17 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author Loki diff --git a/Mage.Sets/src/mage/cards/g/GudulLurker.java b/Mage.Sets/src/mage/cards/g/GudulLurker.java index aeb1192a882..4b21996d7e2 100644 --- a/Mage.Sets/src/mage/cards/g/GudulLurker.java +++ b/Mage.Sets/src/mage/cards/g/GudulLurker.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.keyword.MorphAbility; import mage.abilities.keyword.CantBeBlockedSourceAbility; +import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java b/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java index 782490da4f3..8d42fc98a20 100644 --- a/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java +++ b/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiscardedByOpponentTriggerAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -36,6 +35,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author dustinconrad diff --git a/Mage.Sets/src/mage/cards/g/GuidedStrike.java b/Mage.Sets/src/mage/cards/g/GuidedStrike.java index 3acc1d43496..8d29e88fe21 100644 --- a/Mage.Sets/src/mage/cards/g/GuidedStrike.java +++ b/Mage.Sets/src/mage/cards/g/GuidedStrike.java @@ -27,17 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; -import mage.abilities.effects.Effect; +import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; -import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GuildFeud.java b/Mage.Sets/src/mage/cards/g/GuildFeud.java index 917f0b7a374..b6068b3d93a 100644 --- a/Mage.Sets/src/mage/cards/g/GuildFeud.java +++ b/Mage.Sets/src/mage/cards/g/GuildFeud.java @@ -27,16 +27,11 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; @@ -48,6 +43,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GuildscornWard.java b/Mage.Sets/src/mage/cards/g/GuildscornWard.java index 3fdc9ac6dfd..a9b2d30704f 100644 --- a/Mage.Sets/src/mage/cards/g/GuildscornWard.java +++ b/Mage.Sets/src/mage/cards/g/GuildscornWard.java @@ -27,12 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; @@ -41,11 +35,14 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Guile.java b/Mage.Sets/src/mage/cards/g/Guile.java index 21e6d4bf06a..b047cd2e77e 100644 --- a/Mage.Sets/src/mage/cards/g/Guile.java +++ b/Mage.Sets/src/mage/cards/g/Guile.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromAnywhereSourceTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 diff --git a/Mage.Sets/src/mage/cards/g/Guiltfeeder.java b/Mage.Sets/src/mage/cards/g/Guiltfeeder.java index 6b869f8faee..c50aad08316 100644 --- a/Mage.Sets/src/mage/cards/g/Guiltfeeder.java +++ b/Mage.Sets/src/mage/cards/g/Guiltfeeder.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; import mage.abilities.dynamicvalue.common.CardsInTargetPlayersGraveyardCount; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LoneFox diff --git a/Mage.Sets/src/mage/cards/g/GuiseOfFire.java b/Mage.Sets/src/mage/cards/g/GuiseOfFire.java index a4f0e7843da..6f07841823f 100644 --- a/Mage.Sets/src/mage/cards/g/GuiseOfFire.java +++ b/Mage.Sets/src/mage/cards/g/GuiseOfFire.java @@ -27,20 +27,20 @@ */ package mage.cards.g; -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.combat.AttacksIfAbleAttachedEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.combat.AttacksIfAbleAttachedEffect; /** * @author noxx diff --git a/Mage.Sets/src/mage/cards/g/GulfSquid.java b/Mage.Sets/src/mage/cards/g/GulfSquid.java index aa5df77f8a4..6561bfe9311 100644 --- a/Mage.Sets/src/mage/cards/g/GulfSquid.java +++ b/Mage.Sets/src/mage/cards/g/GulfSquid.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -38,6 +37,8 @@ import mage.constants.CardType; import mage.filter.common.FilterLandPermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/Guma.java b/Mage.Sets/src/mage/cards/g/Guma.java index aa4a8188dc9..07e73145de1 100644 --- a/Mage.Sets/src/mage/cards/g/Guma.java +++ b/Mage.Sets/src/mage/cards/g/Guma.java @@ -28,13 +28,14 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/Gundark.java b/Mage.Sets/src/mage/cards/g/Gundark.java index 33c27f37e46..26534a169c8 100644 --- a/Mage.Sets/src/mage/cards/g/Gundark.java +++ b/Mage.Sets/src/mage/cards/g/Gundark.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -38,6 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GunganCaptain.java b/Mage.Sets/src/mage/cards/g/GunganCaptain.java index 19faa03e27e..5620a58d3f1 100644 --- a/Mage.Sets/src/mage/cards/g/GunganCaptain.java +++ b/Mage.Sets/src/mage/cards/g/GunganCaptain.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToACreatureTriggeredAbility; @@ -37,6 +36,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author Styxo diff --git a/Mage.Sets/src/mage/cards/g/GurmagAngler.java b/Mage.Sets/src/mage/cards/g/GurmagAngler.java index d25de200642..44cba343e60 100644 --- a/Mage.Sets/src/mage/cards/g/GurmagAngler.java +++ b/Mage.Sets/src/mage/cards/g/GurmagAngler.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.DelveAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java index af4e2cfee94..5499e9d7369 100644 --- a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java +++ b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java @@ -27,18 +27,13 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.ExploitCreatureTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ExploitAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -47,6 +42,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GurmagSwiftwing.java b/Mage.Sets/src/mage/cards/g/GurmagSwiftwing.java index 6f81af50354..a72b210085f 100644 --- a/Mage.Sets/src/mage/cards/g/GurmagSwiftwing.java +++ b/Mage.Sets/src/mage/cards/g/GurmagSwiftwing.java @@ -27,15 +27,16 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/Gush.java b/Mage.Sets/src/mage/cards/g/Gush.java index ce5dc9b0758..4292f005970 100644 --- a/Mage.Sets/src/mage/cards/g/Gush.java +++ b/Mage.Sets/src/mage/cards/g/Gush.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -38,6 +37,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Plopman diff --git a/Mage.Sets/src/mage/cards/g/GustSkimmer.java b/Mage.Sets/src/mage/cards/g/GustSkimmer.java index 276f06a36e4..922e76a72eb 100644 --- a/Mage.Sets/src/mage/cards/g/GustSkimmer.java +++ b/Mage.Sets/src/mage/cards/g/GustSkimmer.java @@ -28,10 +28,6 @@ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,6 +35,11 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/GustcloakCavalier.java b/Mage.Sets/src/mage/cards/g/GustcloakCavalier.java index 79220e0ff9f..b4f4e17a4c8 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakCavalier.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakCavalier.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -42,6 +41,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GustcloakHarrier.java b/Mage.Sets/src/mage/cards/g/GustcloakHarrier.java index 4d8b409c26a..26a291c0b5a 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakHarrier.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakHarrier.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GustcloakRunner.java b/Mage.Sets/src/mage/cards/g/GustcloakRunner.java index 0b548c5fe59..e88e88ea64a 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakRunner.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakRunner.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GustcloakSavior.java b/Mage.Sets/src/mage/cards/g/GustcloakSavior.java index 40771391a17..5a58318cb63 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakSavior.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakSavior.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedAllTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GustcloakSentinel.java b/Mage.Sets/src/mage/cards/g/GustcloakSentinel.java index 5a5883f0cd2..f1da65de9f9 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakSentinel.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakSentinel.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedTriggeredAbility; @@ -38,6 +37,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GustcloakSkirmisher.java b/Mage.Sets/src/mage/cards/g/GustcloakSkirmisher.java index d07a9272644..1acbd38613d 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakSkirmisher.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakSkirmisher.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedTriggeredAbility; @@ -39,6 +38,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import java.util.UUID; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GustriderExuberant.java b/Mage.Sets/src/mage/cards/g/GustriderExuberant.java index 51b395df08b..a682911ea94 100644 --- a/Mage.Sets/src/mage/cards/g/GustriderExuberant.java +++ b/Mage.Sets/src/mage/cards/g/GustriderExuberant.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,10 +34,15 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GutShot.java b/Mage.Sets/src/mage/cards/g/GutShot.java index 3fe09ad40e7..892cceaca82 100644 --- a/Mage.Sets/src/mage/cards/g/GutShot.java +++ b/Mage.Sets/src/mage/cards/g/GutShot.java @@ -27,13 +27,14 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GutlessGhoul.java b/Mage.Sets/src/mage/cards/g/GutlessGhoul.java index 33affc7f9e4..bb3208b42e2 100644 --- a/Mage.Sets/src/mage/cards/g/GutlessGhoul.java +++ b/Mage.Sets/src/mage/cards/g/GutlessGhoul.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +36,13 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -49,7 +51,7 @@ public class GutlessGhoul extends CardImpl { public GutlessGhoul(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.supertype.add("Snow"); + this.addSuperType(SuperType.SNOW); this.subtype.add("Zombie"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/g/GutterGrime.java b/Mage.Sets/src/mage/cards/g/GutterGrime.java index d9dc8edc9cb..170c8c3ddc7 100644 --- a/Mage.Sets/src/mage/cards/g/GutterGrime.java +++ b/Mage.Sets/src/mage/cards/g/GutterGrime.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -53,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author BetaSteward diff --git a/Mage.Sets/src/mage/cards/g/GutterSkulk.java b/Mage.Sets/src/mage/cards/g/GutterSkulk.java index dd4bb0a6363..68e6d4dbc9b 100644 --- a/Mage.Sets/src/mage/cards/g/GutterSkulk.java +++ b/Mage.Sets/src/mage/cards/g/GutterSkulk.java @@ -27,11 +27,12 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; + +import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/g/Guttersnipe.java b/Mage.Sets/src/mage/cards/g/Guttersnipe.java index a27d4903210..bb6ef710c7c 100644 --- a/Mage.Sets/src/mage/cards/g/Guttersnipe.java +++ b/Mage.Sets/src/mage/cards/g/Guttersnipe.java @@ -28,19 +28,19 @@ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DamagePlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.TargetController; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GutturalResponse.java b/Mage.Sets/src/mage/cards/g/GutturalResponse.java index 7250aefcb1d..31d78befa21 100644 --- a/Mage.Sets/src/mage/cards/g/GutturalResponse.java +++ b/Mage.Sets/src/mage/cards/g/GutturalResponse.java @@ -27,17 +27,18 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; import mage.ObjectColor; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetSpell; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GutwrencherOni.java b/Mage.Sets/src/mage/cards/g/GutwrencherOni.java index 01ff97454ab..0f9d0c1dd8e 100644 --- a/Mage.Sets/src/mage/cards/g/GutwrencherOni.java +++ b/Mage.Sets/src/mage/cards/g/GutwrencherOni.java @@ -27,11 +27,8 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.abilities.CountType; -import mage.constants.CardType; import mage.MageInt; +import mage.abilities.CountType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -39,11 +36,14 @@ import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java b/Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java index 714479482f8..37d0321e41c 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazAssassin.java @@ -28,7 +28,6 @@ package mage.cards.g; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; @@ -41,6 +40,7 @@ import mage.abilities.keyword.LevelUpAbility; import mage.abilities.keyword.LevelerCardBuilder; import mage.cards.CardSetInfo; import mage.cards.LevelerCard; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/g/GuulDrazOverseer.java b/Mage.Sets/src/mage/cards/g/GuulDrazOverseer.java index 0dd3638f744..11b492abc8c 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazOverseer.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazOverseer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -36,15 +35,13 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java b/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java index 45f08a5fcd5..5638ecab83b 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java @@ -27,25 +27,25 @@ */ package mage.cards.g; -import java.util.Set; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalContinuousEffect; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.Game; +import java.util.Set; +import java.util.UUID; + /** * @author North */ diff --git a/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java b/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java index 682fc11a6c8..16cc824e352 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -43,6 +42,8 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; +import java.util.UUID; + /** * * @author North diff --git a/Mage.Sets/src/mage/cards/g/GwafaHazidProfiteer.java b/Mage.Sets/src/mage/cards/g/GwafaHazidProfiteer.java index 3bb99f31695..7727a1f9d64 100644 --- a/Mage.Sets/src/mage/cards/g/GwafaHazidProfiteer.java +++ b/Mage.Sets/src/mage/cards/g/GwafaHazidProfiteer.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +37,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.RestrictionEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -51,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -65,7 +62,7 @@ public class GwafaHazidProfiteer extends CardImpl { public GwafaHazidProfiteer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/cards/g/GwendlynDiCorci.java b/Mage.Sets/src/mage/cards/g/GwendlynDiCorci.java index 06869ed052a..c0d4e7b7948 100644 --- a/Mage.Sets/src/mage/cards/g/GwendlynDiCorci.java +++ b/Mage.Sets/src/mage/cards/g/GwendlynDiCorci.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -37,9 +36,12 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes @@ -48,7 +50,7 @@ public class GwendlynDiCorci extends CardImpl { public GwendlynDiCorci(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{B}{B}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java b/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java index f203b1c985e..000e265bd58 100644 --- a/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java +++ b/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.KithkinToken; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth diff --git a/Mage.Sets/src/mage/cards/g/GyreSage.java b/Mage.Sets/src/mage/cards/g/GyreSage.java index 6b24695ab5f..722953b8bd9 100644 --- a/Mage.Sets/src/mage/cards/g/GyreSage.java +++ b/Mage.Sets/src/mage/cards/g/GyreSage.java @@ -28,16 +28,17 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.MageInt; -import mage.Mana; -import mage.abilities.dynamicvalue.common.CountersSourceCount; -import mage.abilities.keyword.EvolveAbility; -import mage.abilities.mana.DynamicManaAbility; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.counters.CounterType; + import mage.MageInt; + import mage.Mana; + import mage.abilities.dynamicvalue.common.CountersSourceCount; + import mage.abilities.keyword.EvolveAbility; + import mage.abilities.mana.DynamicManaAbility; + import mage.cards.CardImpl; + import mage.cards.CardSetInfo; + import mage.constants.CardType; + import mage.counters.CounterType; + + import java.util.UUID; /** * diff --git a/Mage.Sets/src/mage/cards/h/HaakonStromgaldScourge.java b/Mage.Sets/src/mage/cards/h/HaakonStromgaldScourge.java index 22226bf2908..f371e06e766 100644 --- a/Mage.Sets/src/mage/cards/h/HaakonStromgaldScourge.java +++ b/Mage.Sets/src/mage/cards/h/HaakonStromgaldScourge.java @@ -28,24 +28,21 @@ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; +import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.AsThoughEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; +import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; -import mage.abilities.effects.common.LoseLifeSourceControllerEffect; + +import java.util.UUID; /** * @@ -55,7 +52,7 @@ public class HaakonStromgaldScourge extends CardImpl { public HaakonStromgaldScourge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/cards/h/HallOfGemstone.java b/Mage.Sets/src/mage/cards/h/HallOfGemstone.java index 00b1037b673..578a7766685 100644 --- a/Mage.Sets/src/mage/cards/h/HallOfGemstone.java +++ b/Mage.Sets/src/mage/cards/h/HallOfGemstone.java @@ -37,10 +37,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ManaEvent; @@ -57,7 +54,7 @@ public class HallOfGemstone extends CardImpl { public HallOfGemstone(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{G}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // At the beginning of each player's upkeep, that player chooses a color. Until end of turn, lands tapped for mana produce mana of the chosen color instead of any other color. this.addAbility(new BeginningOfUntapTriggeredAbility(new HallOfGemstoneEffect(), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/cards/h/HallOfTheBanditLord.java b/Mage.Sets/src/mage/cards/h/HallOfTheBanditLord.java index abfc3d8bcbb..dfba3d59016 100644 --- a/Mage.Sets/src/mage/cards/h/HallOfTheBanditLord.java +++ b/Mage.Sets/src/mage/cards/h/HallOfTheBanditLord.java @@ -27,9 +27,6 @@ */ package mage.cards.h; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageObject; import mage.Mana; import mage.abilities.Ability; @@ -44,10 +41,7 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -56,6 +50,10 @@ import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author emerald000 @@ -64,7 +62,7 @@ public class HallOfTheBanditLord extends CardImpl { public HallOfTheBanditLord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Hall of the Bandit Lord enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/h/HallOfTriumph.java b/Mage.Sets/src/mage/cards/h/HallOfTriumph.java index 082365fce66..bdedf576d6a 100644 --- a/Mage.Sets/src/mage/cards/h/HallOfTriumph.java +++ b/Mage.Sets/src/mage/cards/h/HallOfTriumph.java @@ -36,12 +36,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.ChooseColorEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,7 +49,7 @@ public class HallOfTriumph extends CardImpl { public HallOfTriumph(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // As Hall of Triumph enters the battlefield choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); diff --git a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java index e888547026d..5ec84d8a594 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,12 +41,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +58,7 @@ public class HammerOfPurphoros extends CardImpl { public HammerOfPurphoros(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.ARTIFACT},"{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Creatures you control have haste. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/h/HanSolo.java b/Mage.Sets/src/mage/cards/h/HanSolo.java index 3a7475eb246..149b61f960c 100644 --- a/Mage.Sets/src/mage/cards/h/HanSolo.java +++ b/Mage.Sets/src/mage/cards/h/HanSolo.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,15 +36,14 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -61,7 +59,7 @@ public class HanSolo extends CardImpl { public HanSolo(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java b/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java index cd4d59705ba..d6bfbb2c47d 100644 --- a/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java +++ b/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; @@ -45,6 +45,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +62,7 @@ public class HannaShipsNavigator extends CardImpl { public HannaShipsNavigator(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); diff --git a/Mage.Sets/src/mage/cards/h/HanweirTheWrithingTownship.java b/Mage.Sets/src/mage/cards/h/HanweirTheWrithingTownship.java index 744467610c8..e6e1b2c4919 100644 --- a/Mage.Sets/src/mage/cards/h/HanweirTheWrithingTownship.java +++ b/Mage.Sets/src/mage/cards/h/HanweirTheWrithingTownship.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardSetInfo; import mage.cards.MeldCard; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.permanent.token.EldraziHorrorToken; import java.util.UUID; @@ -46,7 +47,7 @@ import java.util.UUID; public class HanweirTheWrithingTownship extends MeldCard { public HanweirTheWrithingTownship(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, ""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Eldrazi"); this.subtype.add("Ooze"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/h/HazezonTamar.java b/Mage.Sets/src/mage/cards/h/HazezonTamar.java index 11a0dc64729..9775d742acc 100644 --- a/Mage.Sets/src/mage/cards/h/HazezonTamar.java +++ b/Mage.Sets/src/mage/cards/h/HazezonTamar.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -43,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,6 +50,8 @@ import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -65,7 +67,7 @@ public class HazezonTamar extends CardImpl { public HazezonTamar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/h/HeWhoHungers.java b/Mage.Sets/src/mage/cards/h/HeWhoHungers.java index bf89115439a..e5ce49d1007 100644 --- a/Mage.Sets/src/mage/cards/h/HeWhoHungers.java +++ b/Mage.Sets/src/mage/cards/h/HeWhoHungers.java @@ -33,8 +33,6 @@ package mage.cards.h; */ -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -45,6 +43,9 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; @@ -65,7 +66,7 @@ public class HeWhoHungers extends CardImpl { public HeWhoHungers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/h/HeartOfKiran.java b/Mage.Sets/src/mage/cards/h/HeartOfKiran.java index 96741ab7e2c..b4ee81627af 100644 --- a/Mage.Sets/src/mage/cards/h/HeartOfKiran.java +++ b/Mage.Sets/src/mage/cards/h/HeartOfKiran.java @@ -32,16 +32,14 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.AddCardTypeSourceEffect; import mage.abilities.keyword.CrewAbility; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledPlaneswalkerPermanent; import mage.game.Game; @@ -51,7 +49,6 @@ import mage.target.Target; import mage.target.common.TargetControlledPermanent; import java.util.UUID; -import mage.abilities.effects.Effect; /** * @author JRHerlehy @@ -61,7 +58,7 @@ public class HeartOfKiran extends CardImpl { public HeartOfKiran(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vehicle"); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java b/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java index b2745b6edfa..0e35c4eacfc 100644 --- a/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java +++ b/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,7 +51,7 @@ public class HeartlessHidetsugu extends CardImpl { public HeartlessHidetsugu(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ogre"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/h/HeidarRimewindMaster.java b/Mage.Sets/src/mage/cards/h/HeidarRimewindMaster.java index 6ba6eb40846..b1f2a29630d 100644 --- a/Mage.Sets/src/mage/cards/h/HeidarRimewindMaster.java +++ b/Mage.Sets/src/mage/cards/h/HeidarRimewindMaster.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -39,11 +38,14 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -58,7 +60,7 @@ public class HeidarRimewindMaster extends CardImpl { public HeidarRimewindMaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/h/HeliodGodOfTheSun.java b/Mage.Sets/src/mage/cards/h/HeliodGodOfTheSun.java index 0ca61244c14..1f817ca9f29 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodGodOfTheSun.java +++ b/Mage.Sets/src/mage/cards/h/HeliodGodOfTheSun.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,13 +40,12 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +54,7 @@ public class HeliodGodOfTheSun extends CardImpl { public HeliodGodOfTheSun(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/h/Helldozer.java b/Mage.Sets/src/mage/cards/h/Helldozer.java index 1b6551ab30f..4b50816fcef 100644 --- a/Mage.Sets/src/mage/cards/h/Helldozer.java +++ b/Mage.Sets/src/mage/cards/h/Helldozer.java @@ -101,7 +101,7 @@ class HelldozerEffect extends OneShotEffect { } Permanent landPermanent = (Permanent) game.getLastKnownInformation(landTarget.getId(), Zone.BATTLEFIELD); if (landPermanent != null - && !landPermanent.getSupertype().contains("Basic") + && !landPermanent.isBasic() && helldozer != null) { return helldozer.untap(game); } diff --git a/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java b/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java index ee9c3ba07e1..2374e42f4c7 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -45,16 +44,15 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -73,7 +71,7 @@ public class HelmOfKaldra extends CardImpl { public HelmOfKaldra(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature has first strike, trample, and haste. @@ -173,7 +171,7 @@ class KaldraToken extends Token { public KaldraToken() { super("Kaldra", "legendary 4/4 colorless Avatar creature token named Kaldra"); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); subtype.add("Avatar"); power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/Helvault.java b/Mage.Sets/src/mage/cards/h/Helvault.java index 82f9bd39747..119f1cccdc3 100644 --- a/Mage.Sets/src/mage/cards/h/Helvault.java +++ b/Mage.Sets/src/mage/cards/h/Helvault.java @@ -27,10 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,11 +35,17 @@ import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author North @@ -58,7 +60,7 @@ public class Helvault extends CardImpl { public Helvault(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {1}, {tap}: Exile target creature you control. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/cards/h/HeroesPodium.java b/Mage.Sets/src/mage/cards/h/HeroesPodium.java index dc9f3c4e894..61e68af17a6 100644 --- a/Mage.Sets/src/mage/cards/h/HeroesPodium.java +++ b/Mage.Sets/src/mage/cards/h/HeroesPodium.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -37,15 +36,8 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; @@ -54,6 +46,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +62,7 @@ public class HeroesPodium extends CardImpl { public HeroesPodium(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Each legendary creature you control gets +1/+1 for each other legendary creature you control. DynamicValue xValue = new HeroesPodiumLegendaryCount(); diff --git a/Mage.Sets/src/mage/cards/h/HighlandWeald.java b/Mage.Sets/src/mage/cards/h/HighlandWeald.java index 854ffe6b970..68b1f7ef2f8 100644 --- a/Mage.Sets/src/mage/cards/h/HighlandWeald.java +++ b/Mage.Sets/src/mage/cards/h/HighlandWeald.java @@ -35,6 +35,7 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -44,7 +45,7 @@ public class HighlandWeald extends CardImpl { public HighlandWeald(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Snow"); + this.addSuperType(SuperType.SNOW); // Highland Weald enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java b/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java index 3b80c30a4cb..ebe5d198421 100644 --- a/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java +++ b/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java @@ -27,9 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,6 +38,8 @@ import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.NinjutsuAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; @@ -48,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +58,7 @@ public class HigureTheStillWind extends CardImpl { private static final FilterCard filter = new FilterCard("Ninja card"); private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("Ninja creature"); static { - filter.add((new SubtypePredicate("Ninja"))); + filter.add(new SubtypePredicate("Ninja")); filterCreature.add((new SubtypePredicate("Ninja"))); } @@ -65,7 +66,7 @@ public class HigureTheStillWind extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); this.subtype.add("Human"); this.subtype.add("Ninja"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HikariTwilightGuardian.java b/Mage.Sets/src/mage/cards/h/HikariTwilightGuardian.java index 7f129705a71..aa765634c7d 100644 --- a/Mage.Sets/src/mage/cards/h/HikariTwilightGuardian.java +++ b/Mage.Sets/src/mage/cards/h/HikariTwilightGuardian.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; @@ -36,8 +35,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterSpiritOrArcaneCard; +import java.util.UUID; + /** * * @author Loki @@ -48,7 +50,7 @@ public class HikariTwilightGuardian extends CardImpl { public HikariTwilightGuardian(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HiredMuscle.java b/Mage.Sets/src/mage/cards/h/HiredMuscle.java index 964645e6611..b12ea5d24d9 100644 --- a/Mage.Sets/src/mage/cards/h/HiredMuscle.java +++ b/Mage.Sets/src/mage/cards/h/HiredMuscle.java @@ -44,6 +44,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -93,7 +94,7 @@ class Scarmaker extends Token { Scarmaker() { super("Scarmaker", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java b/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java index f858769a3d8..af67d55df05 100644 --- a/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java +++ b/Mage.Sets/src/mage/cards/h/HisokaMinamoSensei.java @@ -42,6 +42,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; @@ -58,7 +59,7 @@ public class HisokaMinamoSensei extends CardImpl { public HisokaMinamoSensei(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/h/HixusPrisonWarden.java b/Mage.Sets/src/mage/cards/h/HixusPrisonWarden.java index 71bf5f2eb86..be852ee90f2 100644 --- a/Mage.Sets/src/mage/cards/h/HixusPrisonWarden.java +++ b/Mage.Sets/src/mage/cards/h/HixusPrisonWarden.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -50,6 +50,8 @@ import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +60,7 @@ public class HixusPrisonWarden extends CardImpl { public HixusPrisonWarden(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HokoriDustDrinker.java b/Mage.Sets/src/mage/cards/h/HokoriDustDrinker.java index bcc724718d9..b817e76543e 100644 --- a/Mage.Sets/src/mage/cards/h/HokoriDustDrinker.java +++ b/Mage.Sets/src/mage/cards/h/HokoriDustDrinker.java @@ -27,11 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,8 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.Duration; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -50,6 +44,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * @author LevelX2 */ @@ -57,7 +53,7 @@ public class HokoriDustDrinker extends CardImpl { public HokoriDustDrinker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java index d1e72db9ee9..5f95d7deb4e 100644 --- a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java +++ b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; @@ -48,16 +47,15 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -66,7 +64,7 @@ public class HomuraHumanAscendant extends CardImpl { public HomuraHumanAscendant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Monk"); @@ -134,7 +132,7 @@ class HomurasEssence2 extends Token { HomurasEssence2() { super("Homura's Essence", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.ENCHANTMENT); color.setRed(true); // Creatures you control get +2/+2 and have flying and "{R}: This creature gets +1/+0 until end of turn." diff --git a/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java b/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java index 97bc6dd8d56..b605484bf52 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java @@ -28,18 +28,19 @@ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * @author Loki */ @@ -53,7 +54,7 @@ public class HondenOfCleansingFire extends CardImpl { public HondenOfCleansingFire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Shrine"); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java index d7095c83765..ffdaf406ff5 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java @@ -28,20 +28,21 @@ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki @@ -56,7 +57,7 @@ public class HondenOfInfiniteRage extends CardImpl { public HondenOfInfiniteRage (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Shrine"); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java b/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java index 24bf21e84dd..254cef86d7e 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java @@ -28,19 +28,20 @@ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SpiritToken; +import java.util.UUID; + /** * @author Loki */ @@ -54,7 +55,7 @@ public class HondenOfLifesWeb extends CardImpl { public HondenOfLifesWeb(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Shrine"); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java index d0f377658c6..193b7fcf2c7 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java @@ -28,20 +28,21 @@ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * @author Loki */ @@ -55,7 +56,7 @@ public class HondenOfNightsReach extends CardImpl { public HondenOfNightsReach(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Shrine"); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java b/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java index 624f0a6a4a0..5021fedeee7 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java @@ -28,18 +28,19 @@ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * @author Loki */ @@ -53,7 +54,7 @@ public class HondenOfSeeingWinds extends CardImpl { public HondenOfSeeingWinds(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Shrine"); diff --git a/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java b/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java index 937c63f2359..ec384254cd5 100644 --- a/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java +++ b/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java @@ -42,11 +42,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPlayer; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -66,7 +62,7 @@ public class HopeOfGhirapur extends CardImpl { public HopeOfGhirapur(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Thopter"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/h/HordeOfNotions.java b/Mage.Sets/src/mage/cards/h/HordeOfNotions.java index 0dd44e827af..606aaebb9c6 100644 --- a/Mage.Sets/src/mage/cards/h/HordeOfNotions.java +++ b/Mage.Sets/src/mage/cards/h/HordeOfNotions.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,6 +48,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +64,7 @@ public class HordeOfNotions extends CardImpl { public HordeOfNotions(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/h/HorobiDeathsWail.java b/Mage.Sets/src/mage/cards/h/HorobiDeathsWail.java index c01b48a6b28..cdb3a520ffc 100644 --- a/Mage.Sets/src/mage/cards/h/HorobiDeathsWail.java +++ b/Mage.Sets/src/mage/cards/h/HorobiDeathsWail.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -36,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -43,6 +43,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX @@ -51,7 +53,7 @@ public class HorobiDeathsWail extends CardImpl { public HorobiDeathsWail(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HuaTuoHonoredPhysician.java b/Mage.Sets/src/mage/cards/h/HuaTuoHonoredPhysician.java index d332ad10cce..fc71a9c972c 100644 --- a/Mage.Sets/src/mage/cards/h/HuaTuoHonoredPhysician.java +++ b/Mage.Sets/src/mage/cards/h/HuaTuoHonoredPhysician.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -37,10 +36,13 @@ import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,7 +51,7 @@ public class HuaTuoHonoredPhysician extends CardImpl { public HuaTuoHonoredPhysician(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java b/Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java index f2be9107291..d78e67dacd6 100644 --- a/Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java +++ b/Mage.Sets/src/mage/cards/h/HuangZhongShuGeneral.java @@ -27,15 +27,17 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedByMoreThanOneSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes @@ -44,7 +46,7 @@ public class HuangZhongShuGeneral extends CardImpl { public HuangZhongShuGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/h/HundingGjornersen.java b/Mage.Sets/src/mage/cards/h/HundingGjornersen.java index 0da745e2400..dd7b07703f6 100644 --- a/Mage.Sets/src/mage/cards/h/HundingGjornersen.java +++ b/Mage.Sets/src/mage/cards/h/HundingGjornersen.java @@ -27,12 +27,14 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.RampageAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class HundingGjornersen extends CardImpl { public HundingGjornersen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/h/HythoniaTheCruel.java b/Mage.Sets/src/mage/cards/h/HythoniaTheCruel.java index 97fa23f8d84..fcc98c527a0 100644 --- a/Mage.Sets/src/mage/cards/h/HythoniaTheCruel.java +++ b/Mage.Sets/src/mage/cards/h/HythoniaTheCruel.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; @@ -36,10 +35,13 @@ import mage.abilities.keyword.MonstrosityAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class HythoniaTheCruel extends CardImpl { public HythoniaTheCruel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Gorgon"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/i/IG88B.java b/Mage.Sets/src/mage/cards/i/IG88B.java index c76b73ce406..303400c55c1 100644 --- a/Mage.Sets/src/mage/cards/i/IG88B.java +++ b/Mage.Sets/src/mage/cards/i/IG88B.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -39,11 +38,14 @@ import mage.abilities.keyword.RepairAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Styxo @@ -52,7 +54,7 @@ public class IG88B extends CardImpl { public IG88B(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Droid"); this.subtype.add("Hunter"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java index 69c81978910..7221d443b1a 100644 --- a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java +++ b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java @@ -27,9 +27,6 @@ */ package mage.cards.i; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedAllTriggeredAbility; @@ -39,10 +36,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,6 +48,10 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.GoblinToken; import mage.target.common.TargetControlledPermanent; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -72,7 +70,7 @@ public class IbHalfheartGoblinTactician extends CardImpl { public IbHalfheartGoblinTactician(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/i/Icequake.java b/Mage.Sets/src/mage/cards/i/Icequake.java index 63cc1d419d0..2104a04d2a4 100644 --- a/Mage.Sets/src/mage/cards/i/Icequake.java +++ b/Mage.Sets/src/mage/cards/i/Icequake.java @@ -89,7 +89,7 @@ class IcequakeEffect extends OneShotEffect { Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null && controller != null) { permanent.destroy(source.getSourceId(), game, false); - if (permanent.getSupertype().contains("Snow")) { + if (permanent.isSnow()) { controller.damage(1, source.getSourceId(), game, false, true); } return true; diff --git a/Mage.Sets/src/mage/cards/i/IhsansShade.java b/Mage.Sets/src/mage/cards/i/IhsansShade.java index 14d6eaf59d2..9e06a4af1cd 100644 --- a/Mage.Sets/src/mage/cards/i/IhsansShade.java +++ b/Mage.Sets/src/mage/cards/i/IhsansShade.java @@ -27,13 +27,15 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class IhsansShade extends CardImpl { public IhsansShade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Shade"); this.subtype.add("Knight"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java b/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java index 318e09bb594..1388dea06d8 100644 --- a/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java +++ b/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java @@ -27,9 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,12 +37,16 @@ import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -60,7 +61,7 @@ public class IizukaTheRuthless extends CardImpl { public IizukaTheRuthless(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/i/IkraShidiqiTheUsurper.java b/Mage.Sets/src/mage/cards/i/IkraShidiqiTheUsurper.java index 7178ddbb70e..990defb38a1 100644 --- a/Mage.Sets/src/mage/cards/i/IkraShidiqiTheUsurper.java +++ b/Mage.Sets/src/mage/cards/i/IkraShidiqiTheUsurper.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; @@ -36,6 +35,7 @@ import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedEvent; @@ -43,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author spjspj @@ -52,7 +54,7 @@ public class IkraShidiqiTheUsurper extends CardImpl { public IkraShidiqiTheUsurper(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Naga"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java b/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java index 2b23466076b..04299ed5eff 100644 --- a/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java +++ b/Mage.Sets/src/mage/cards/i/InTheEyeOfChaos.java @@ -34,10 +34,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -57,7 +54,7 @@ public class InTheEyeOfChaos extends CardImpl { public InTheEyeOfChaos(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // Whenever a player casts an instant spell, counter it unless that player pays {X}, where X is its converted mana cost. diff --git a/Mage.Sets/src/mage/cards/i/InameAsOne.java b/Mage.Sets/src/mage/cards/i/InameAsOne.java index 95355f2cf2b..52bcacb2fb3 100644 --- a/Mage.Sets/src/mage/cards/i/InameAsOne.java +++ b/Mage.Sets/src/mage/cards/i/InameAsOne.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -45,6 +44,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -54,6 +54,8 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +70,7 @@ public class InameAsOne extends CardImpl { public InameAsOne(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{8}{B}{B}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/i/InameDeathAspect.java b/Mage.Sets/src/mage/cards/i/InameDeathAspect.java index 808d84c9fca..02aaecb3baa 100644 --- a/Mage.Sets/src/mage/cards/i/InameDeathAspect.java +++ b/Mage.Sets/src/mage/cards/i/InameDeathAspect.java @@ -37,6 +37,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class InameDeathAspect extends CardImpl { public InameDeathAspect(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/i/InameLifeAspect.java b/Mage.Sets/src/mage/cards/i/InameLifeAspect.java index 9fdc825ecb1..8d984058ac0 100644 --- a/Mage.Sets/src/mage/cards/i/InameLifeAspect.java +++ b/Mage.Sets/src/mage/cards/i/InameLifeAspect.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -40,12 +39,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki @@ -60,7 +62,7 @@ public class InameLifeAspect extends CardImpl { public InameLifeAspect(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/i/InfernalKirin.java b/Mage.Sets/src/mage/cards/i/InfernalKirin.java index 3051106b598..e92e8840e96 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalKirin.java +++ b/Mage.Sets/src/mage/cards/i/InfernalKirin.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.Game; @@ -46,6 +46,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class InfernalKirin extends CardImpl { public InfernalKirin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kirin"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/i/InitiateOfBlood.java b/Mage.Sets/src/mage/cards/i/InitiateOfBlood.java index 525a567cb68..22d7b8c46a8 100644 --- a/Mage.Sets/src/mage/cards/i/InitiateOfBlood.java +++ b/Mage.Sets/src/mage/cards/i/InitiateOfBlood.java @@ -29,6 +29,7 @@ */ package mage.cards.i; +import mage.constants.SuperType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; @@ -98,7 +99,7 @@ class GokaTheUnjust extends Token { GokaTheUnjust() { super("Goka the Unjust", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Ogre"); diff --git a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java index 191fff6146b..22a804e47dc 100644 --- a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java +++ b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -49,6 +49,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +61,7 @@ public class InkEyesServantOfOni extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); this.subtype.add("Rat"); this.subtype.add("Ninja"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/i/IntetTheDreamer.java b/Mage.Sets/src/mage/cards/i/IntetTheDreamer.java index a8dfc60f0e2..e4c8e2a8456 100644 --- a/Mage.Sets/src/mage/cards/i/IntetTheDreamer.java +++ b/Mage.Sets/src/mage/cards/i/IntetTheDreamer.java @@ -27,9 +27,6 @@ */ package mage.cards.i; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -43,16 +40,16 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.ExileZone; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author fireshoes @@ -63,7 +60,7 @@ public class IntetTheDreamer extends CardImpl { public IntetTheDreamer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/i/InventorsFair.java b/Mage.Sets/src/mage/cards/i/InventorsFair.java index 7d0fd296654..b2d76ff9c64 100644 --- a/Mage.Sets/src/mage/cards/i/InventorsFair.java +++ b/Mage.Sets/src/mage/cards/i/InventorsFair.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterArtifactPermanent; @@ -50,6 +50,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes @@ -64,7 +66,7 @@ public class InventorsFair extends CardImpl { public InventorsFair(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // At the beginning of your upkeep, if you control three or more artifacts, you gain 1 life. this.addAbility(new InventorsFairAbility()); diff --git a/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java b/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java index 2a020287a4c..f4e2e9a7d44 100644 --- a/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java +++ b/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -40,13 +39,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +53,7 @@ public class IonaShieldOfEmeria extends CardImpl { public IonaShieldOfEmeria(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/i/IriniSengir.java b/Mage.Sets/src/mage/cards/i/IriniSengir.java index 6137f6bef9f..4d575555366 100644 --- a/Mage.Sets/src/mage/cards/i/IriniSengir.java +++ b/Mage.Sets/src/mage/cards/i/IriniSengir.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -35,11 +34,14 @@ import mage.abilities.effects.common.cost.SpellsCostIncreasementAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterEnchantmentCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -54,7 +56,7 @@ public class IriniSengir extends CardImpl { public IriniSengir(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Dwarf"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/i/IroasGodOfVictory.java b/Mage.Sets/src/mage/cards/i/IroasGodOfVictory.java index 986d92e9b09..7093e746b89 100644 --- a/Mage.Sets/src/mage/cards/i/IroasGodOfVictory.java +++ b/Mage.Sets/src/mage/cards/i/IroasGodOfVictory.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.DevotionCount; @@ -39,16 +38,14 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreatureInPlay; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +61,7 @@ public class IroasGodOfVictory extends CardImpl { public IroasGodOfVictory(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{2}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/i/IsamaruHoundofKonda.java b/Mage.Sets/src/mage/cards/i/IsamaruHoundofKonda.java index ede4696d6ff..39990148fc7 100644 --- a/Mage.Sets/src/mage/cards/i/IsamaruHoundofKonda.java +++ b/Mage.Sets/src/mage/cards/i/IsamaruHoundofKonda.java @@ -33,6 +33,7 @@ import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; /** * @@ -42,7 +43,7 @@ public class IsamaruHoundofKonda extends CardImpl { public IsamaruHoundofKonda (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Hound"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java b/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java index 204da008b1c..728e13015b3 100644 --- a/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java +++ b/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java @@ -27,9 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredAbility; @@ -39,11 +36,15 @@ import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Loki @@ -58,7 +59,7 @@ public class IsaoEnlightenedBushi extends CardImpl { public IsaoEnlightenedBushi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/i/IshaiOjutaiDragonspeaker.java b/Mage.Sets/src/mage/cards/i/IshaiOjutaiDragonspeaker.java index 24558f7f200..43135085019 100644 --- a/Mage.Sets/src/mage/cards/i/IshaiOjutaiDragonspeaker.java +++ b/Mage.Sets/src/mage/cards/i/IshaiOjutaiDragonspeaker.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -36,8 +35,11 @@ import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Styxo @@ -47,7 +49,7 @@ public class IshaiOjutaiDragonspeaker extends CardImpl { public IshaiOjutaiDragonspeaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Bird"); this.subtype.add("Monk"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/i/IshiIshiAkkiCrackshot.java b/Mage.Sets/src/mage/cards/i/IshiIshiAkkiCrackshot.java index bf31f27e9c0..4bd147f62fa 100644 --- a/Mage.Sets/src/mage/cards/i/IshiIshiAkkiCrackshot.java +++ b/Mage.Sets/src/mage/cards/i/IshiIshiAkkiCrackshot.java @@ -27,19 +27,17 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +52,7 @@ public class IshiIshiAkkiCrackshot extends CardImpl { public IshiIshiAkkiCrackshot(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java index 648acec363d..1c6e79ee1ac 100644 --- a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java +++ b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,12 +41,15 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SpiderToken; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author fireshoes @@ -62,7 +64,7 @@ public class IshkanahGrafwidow extends CardImpl { public IshkanahGrafwidow(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spider"); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/i/IsperiaSupremeJudge.java b/Mage.Sets/src/mage/cards/i/IsperiaSupremeJudge.java index 7c8eadcd8f4..db87ecc19bd 100644 --- a/Mage.Sets/src/mage/cards/i/IsperiaSupremeJudge.java +++ b/Mage.Sets/src/mage/cards/i/IsperiaSupremeJudge.java @@ -27,15 +27,16 @@ */ package mage.cards.i; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksAllTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -47,7 +48,7 @@ public class IsperiaSupremeJudge extends CardImpl { public IsperiaSupremeJudge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}{U}{U}"); this.subtype.add("Sphinx"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); diff --git a/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java b/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java index 2411c75d20d..1a9b33fb005 100644 --- a/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java +++ b/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -56,7 +57,7 @@ public class IsperiaTheInscrutable extends CardImpl { public IsperiaTheInscrutable(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}{U}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Sphinx"); this.power = new MageInt(3); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/i/IthHighArcanist.java b/Mage.Sets/src/mage/cards/i/IthHighArcanist.java index da3ca1d82a2..1eddda68916 100644 --- a/Mage.Sets/src/mage/cards/i/IthHighArcanist.java +++ b/Mage.Sets/src/mage/cards/i/IthHighArcanist.java @@ -43,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetAttackingCreature; @@ -54,7 +55,7 @@ public class IthHighArcanist extends CardImpl { public IthHighArcanist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java b/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java index c05d1e723cc..aca5c102ae3 100644 --- a/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java +++ b/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java @@ -27,19 +27,15 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TrampleAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -49,6 +45,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +55,7 @@ public class IwamoriOfTheOpenFist extends CardImpl { public IwamoriOfTheOpenFist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Monk"); diff --git a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java index 2adf33e4373..eae3f6c0e25 100644 --- a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java +++ b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,16 +36,15 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.FaceDownPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author cg5 @@ -64,7 +62,7 @@ public class IxidorRealitySculptor extends CardImpl { public IxidorRealitySculptor(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java b/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java index bd38d7661ea..a6d1544d136 100644 --- a/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java +++ b/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterOpponentsCreaturePermanent; @@ -53,6 +53,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponentsCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -67,7 +69,7 @@ public class JabbaTheHutt extends CardImpl { public JabbaTheHutt(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Hutt"); this.subtype.add("Rogue"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java b/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java index 48133439643..c66fc52e6a9 100644 --- a/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java +++ b/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Gender; @@ -42,8 +41,11 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +54,7 @@ public class JaceVrynsProdigy extends CardImpl { public JaceVrynsProdigy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/j/JacquesLeVert.java b/Mage.Sets/src/mage/cards/j/JacquesLeVert.java index 6120886109d..ed54c355202 100644 --- a/Mage.Sets/src/mage/cards/j/JacquesLeVert.java +++ b/Mage.Sets/src/mage/cards/j/JacquesLeVert.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -54,7 +55,7 @@ public class JacquesLeVert extends CardImpl { public JacquesLeVert(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{G}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java b/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java index b176ab36d96..21396accd93 100644 --- a/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java +++ b/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.RevealCardsFromLibraryUntilEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; @@ -46,6 +46,8 @@ import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +64,7 @@ public class JaliraMasterPolymorphist extends CardImpl { public JaliraMasterPolymorphist(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/j/JangoFett.java b/Mage.Sets/src/mage/cards/j/JangoFett.java index 20a11148bd8..17c7ef45802 100644 --- a/Mage.Sets/src/mage/cards/j/JangoFett.java +++ b/Mage.Sets/src/mage/cards/j/JangoFett.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -41,10 +40,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; +import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -52,7 +53,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetOpponentsCreaturePermanent; -import mage.filter.predicate.permanent.CounterPredicate; + +import java.util.UUID; /** * @@ -62,7 +64,7 @@ public class JangoFett extends CardImpl { public JangoFett(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Hunter"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/j/JarJarBinks.java b/Mage.Sets/src/mage/cards/j/JarJarBinks.java index 947ecd4df3a..83036a3a124 100644 --- a/Mage.Sets/src/mage/cards/j/JarJarBinks.java +++ b/Mage.Sets/src/mage/cards/j/JarJarBinks.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -38,12 +37,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -54,6 +48,8 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Styxo @@ -62,7 +58,7 @@ public class JarJarBinks extends CardImpl { public JarJarBinks(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Gungan"); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java index 96bbd8f1a4a..296096d681a 100644 --- a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java +++ b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java @@ -27,9 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,7 +41,9 @@ import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; @@ -54,6 +53,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -72,7 +73,7 @@ public class JaradGolgariLichLord extends CardImpl { public JaradGolgariLichLord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Elf"); diff --git a/Mage.Sets/src/mage/cards/j/JarethLeonineTitan.java b/Mage.Sets/src/mage/cards/j/JarethLeonineTitan.java index 5047e91f163..48dc5dba6c2 100644 --- a/Mage.Sets/src/mage/cards/j/JarethLeonineTitan.java +++ b/Mage.Sets/src/mage/cards/j/JarethLeonineTitan.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksTriggeredAbility; @@ -39,8 +38,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,7 +51,7 @@ public class JarethLeonineTitan extends CardImpl { public JarethLeonineTitan(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cat"); this.subtype.add("Giant"); diff --git a/Mage.Sets/src/mage/cards/j/JasmineBoreal.java b/Mage.Sets/src/mage/cards/j/JasmineBoreal.java index 93848240574..2caf36856be 100644 --- a/Mage.Sets/src/mage/cards/j/JasmineBoreal.java +++ b/Mage.Sets/src/mage/cards/j/JasmineBoreal.java @@ -27,11 +27,13 @@ */ package mage.cards.j; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class JasmineBoreal extends CardImpl { public JasmineBoreal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java index 3432637ed4c..56004758cde 100644 --- a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -41,10 +40,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -54,6 +50,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.DamagedByWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +66,7 @@ public class JayaBallardTaskMage extends CardImpl { public JayaBallardTaskMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Spellshaper"); diff --git a/Mage.Sets/src/mage/cards/j/JazalGoldmane.java b/Mage.Sets/src/mage/cards/j/JazalGoldmane.java index 84a1a8f3112..f8c81c1259f 100644 --- a/Mage.Sets/src/mage/cards/j/JazalGoldmane.java +++ b/Mage.Sets/src/mage/cards/j/JazalGoldmane.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,9 +38,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; +import java.util.UUID; + /** * * @author LevelX2 @@ -50,7 +52,7 @@ public class JazalGoldmane extends CardImpl { public JazalGoldmane(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cat"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/j/JeditOjanen.java b/Mage.Sets/src/mage/cards/j/JeditOjanen.java index 987a606eca1..52f0df46a9a 100644 --- a/Mage.Sets/src/mage/cards/j/JeditOjanen.java +++ b/Mage.Sets/src/mage/cards/j/JeditOjanen.java @@ -27,11 +27,13 @@ */ package mage.cards.j; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class JeditOjanen extends CardImpl { public JeditOjanen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cat"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java b/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java index 17b5a080c14..78e28e09b8b 100644 --- a/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java +++ b/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -35,8 +34,11 @@ import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes @@ -45,7 +47,7 @@ public class JeditOjanenOfEfrava extends CardImpl { public JeditOjanenOfEfrava(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cat"); this.subtype.add("Warrior"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java b/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java index 497ce7e5df7..c397716dbb9 100644 --- a/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java +++ b/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.WatcherScope; import mage.filter.common.FilterInstantOrSorceryCard; import mage.game.ExileZone; @@ -61,7 +62,7 @@ public class JelevaNephaliasScourge extends CardImpl { public JelevaNephaliasScourge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java b/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java index b502e096be9..d1db47a4f6e 100644 --- a/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java +++ b/Mage.Sets/src/mage/cards/j/JenaraAsuraOfWar.java @@ -28,9 +28,6 @@ package mage.cards.j; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,8 +35,13 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +51,7 @@ public class JenaraAsuraOfWar extends CardImpl { public JenaraAsuraOfWar (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}{U}"); this.subtype.add("Angel"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); diff --git a/Mage.Sets/src/mage/cards/j/JerrardOfTheClosedFist.java b/Mage.Sets/src/mage/cards/j/JerrardOfTheClosedFist.java index 28adb1ef308..1096f02ea15 100644 --- a/Mage.Sets/src/mage/cards/j/JerrardOfTheClosedFist.java +++ b/Mage.Sets/src/mage/cards/j/JerrardOfTheClosedFist.java @@ -27,11 +27,13 @@ */ package mage.cards.j; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class JerrardOfTheClosedFist extends CardImpl { public JerrardOfTheClosedFist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java b/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java index 5eb43837f82..c7e47f19679 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java +++ b/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +37,12 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LoneFox @@ -49,7 +51,7 @@ public class JeskaWarriorAdept extends CardImpl { public JeskaWarriorAdept(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Barbarian"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java b/Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java index 7781c9216fb..e5655bd785a 100644 --- a/Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java +++ b/Mage.Sets/src/mage/cards/j/JhoiraOfTheGhitu.java @@ -45,6 +45,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterNonlandCard; @@ -60,7 +61,7 @@ public class JhoiraOfTheGhitu extends CardImpl { public JhoiraOfTheGhitu(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java b/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java index bc2efd5231c..7ebc4358882 100644 --- a/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java +++ b/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java @@ -48,7 +48,7 @@ public class JinGitaxiasCoreAugur extends CardImpl { public JinGitaxiasCoreAugur(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{8}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Praetor"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java b/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java index ce829776f51..8dd578398ae 100644 --- a/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java +++ b/Mage.Sets/src/mage/cards/j/JiwariTheEarthAflame.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,12 +40,15 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -61,7 +63,7 @@ public class JiwariTheEarthAflame extends CardImpl { public JiwariTheEarthAflame(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java b/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java index df390904d69..7d27f38ffa3 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java +++ b/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +37,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BecomesCreatureAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; @@ -52,6 +48,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +58,7 @@ public class JolraelEmpressOfBeasts extends CardImpl { public JolraelEmpressOfBeasts(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Spellshaper"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java b/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java index bdf8083a415..029dee55829 100644 --- a/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java +++ b/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; @@ -38,9 +37,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author North @@ -51,7 +53,7 @@ public class JorKadeenThePrevailer extends CardImpl { public JorKadeenThePrevailer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/j/JoriEnRuinDiver.java b/Mage.Sets/src/mage/cards/j/JoriEnRuinDiver.java index ae19815c901..758842f1b15 100644 --- a/Mage.Sets/src/mage/cards/j/JoriEnRuinDiver.java +++ b/Mage.Sets/src/mage/cards/j/JoriEnRuinDiver.java @@ -27,19 +27,21 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.watchers.common.CastSpellLastTurnWatcher; +import java.util.UUID; + /** * * @author fireshoes @@ -48,7 +50,7 @@ public class JoriEnRuinDiver extends CardImpl { public JoriEnRuinDiver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.subtype.add("Wizard"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/j/Joven.java b/Mage.Sets/src/mage/cards/j/Joven.java index 16303eb5076..1f54fa6592e 100644 --- a/Mage.Sets/src/mage/cards/j/Joven.java +++ b/Mage.Sets/src/mage/cards/j/Joven.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,11 +36,14 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; + +import java.util.UUID; /** * * @author fireshoes @@ -56,7 +58,7 @@ public class Joven extends CardImpl { public Joven(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/j/JuganTheRisingStar.java b/Mage.Sets/src/mage/cards/j/JuganTheRisingStar.java index 551b1427b57..9da42c9bd90 100644 --- a/Mage.Sets/src/mage/cards/j/JuganTheRisingStar.java +++ b/Mage.Sets/src/mage/cards/j/JuganTheRisingStar.java @@ -28,7 +28,6 @@ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -37,9 +36,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.UUID; + /** * @author LevelX */ @@ -47,7 +49,7 @@ public class JuganTheRisingStar extends CardImpl { public JuganTheRisingStar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/j/JushiApprentice.java b/Mage.Sets/src/mage/cards/j/JushiApprentice.java index 595df877fd7..a0030807742 100644 --- a/Mage.Sets/src/mage/cards/j/JushiApprentice.java +++ b/Mage.Sets/src/mage/cards/j/JushiApprentice.java @@ -27,13 +27,9 @@ */ package mage.cards.j; -import java.util.UUID; - -import mage.abilities.CountType; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; +import mage.abilities.CountType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.CardsInHandCondition; import mage.abilities.costs.common.TapSourceCost; @@ -45,9 +41,14 @@ import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.FlipSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.permanent.token.Token; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 @@ -86,7 +87,7 @@ class TomoyaTheRevealer extends Token { TomoyaTheRevealer() { super("Tomoya the Revealer", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add("Human"); diff --git a/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java b/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java index 8ef906ed087..416f6df89d6 100644 --- a/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java +++ b/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; @@ -57,7 +58,7 @@ public class KaaliaOfTheVast extends CardImpl { public KaaliaOfTheVast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java index a929ca0b7ad..e711a881bf1 100644 --- a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java +++ b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -35,10 +34,7 @@ import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterSpell; import mage.game.Game; import mage.game.permanent.Permanent; @@ -46,6 +42,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -55,7 +53,7 @@ public class KaervekTheMerciless extends CardImpl { public KaervekTheMerciless(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java b/Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java index 30a057645c1..d8f34e46dc2 100644 --- a/Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java +++ b/Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,9 +42,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class KagemaroFirstToSuffer extends CardImpl { public KagemaroFirstToSuffer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java index 1a1620da811..d3ec8b6ffe0 100644 --- a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java +++ b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java @@ -44,6 +44,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; @@ -63,7 +64,7 @@ public class KahoMinamoHistorian extends CardImpl { public KahoMinamoHistorian(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KalemneDiscipleOfIroas.java b/Mage.Sets/src/mage/cards/k/KalemneDiscipleOfIroas.java index fa24d788b9e..6b58126d3fe 100644 --- a/Mage.Sets/src/mage/cards/k/KalemneDiscipleOfIroas.java +++ b/Mage.Sets/src/mage/cards/k/KalemneDiscipleOfIroas.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.Filter; @@ -51,6 +51,8 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes @@ -66,7 +68,7 @@ public class KalemneDiscipleOfIroas extends CardImpl { public KalemneDiscipleOfIroas(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Giant"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java index 70e6be220ab..c8803fd7102 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,7 +55,7 @@ public class KalitasBloodchiefOfGhet extends CardImpl { public KalitasBloodchiefOfGhet(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java index f1a68420e7a..aae6f58ee21 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java @@ -28,6 +28,7 @@ package mage.cards.k; import java.util.UUID; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +41,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -59,7 +57,6 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; /** - * * @author fireshoes */ public class KalitasTraitorOfGhet extends CardImpl { @@ -73,8 +70,8 @@ public class KalitasTraitorOfGhet extends CardImpl { } public KalitasTraitorOfGhet(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Warrior"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java b/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java index 2317c60154a..79a35673231 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java @@ -27,9 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,10 +36,15 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author Backfir3 @@ -51,7 +53,7 @@ public class KamahlFistOfKrosa extends CardImpl { public KamahlFistOfKrosa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java b/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java index dbd755dc4b2..4560b91e591 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java +++ b/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java @@ -27,9 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +35,13 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +50,7 @@ public class KamahlPitFighter extends CardImpl { public KamahlPitFighter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Barbarian"); diff --git a/Mage.Sets/src/mage/cards/k/KambalConsulOfAllocation.java b/Mage.Sets/src/mage/cards/k/KambalConsulOfAllocation.java index 5905aa670c6..15d89a8ee5b 100644 --- a/Mage.Sets/src/mage/cards/k/KambalConsulOfAllocation.java +++ b/Mage.Sets/src/mage/cards/k/KambalConsulOfAllocation.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastOpponentTriggeredAbility; @@ -38,11 +37,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SetTargetPointer; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author emerald000 @@ -56,7 +58,7 @@ public class KambalConsulOfAllocation extends CardImpl { public KambalConsulOfAllocation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KamiOfTheCrescentMoon.java b/Mage.Sets/src/mage/cards/k/KamiOfTheCrescentMoon.java index 3005a3c3107..b89e0607e45 100644 --- a/Mage.Sets/src/mage/cards/k/KamiOfTheCrescentMoon.java +++ b/Mage.Sets/src/mage/cards/k/KamiOfTheCrescentMoon.java @@ -27,14 +27,16 @@ */ package mage.cards.k; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.TargetController; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class KamiOfTheCrescentMoon extends CardImpl { public KamiOfTheCrescentMoon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java index 344d6975a09..a71db140996 100644 --- a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java +++ b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java @@ -47,6 +47,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -69,7 +70,7 @@ public class KangeeAerieKeeper extends CardImpl { public KangeeAerieKeeper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Bird"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java b/Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java index 9fab0792f1e..aa7c8372c9e 100644 --- a/Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java +++ b/Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -39,15 +38,7 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.events.GameEvent; @@ -57,6 +48,8 @@ import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; import mage.watchers.Watcher; +import java.util.UUID; + /** * * @author emerald000 @@ -65,7 +58,7 @@ public class KaradorGhostChieftain extends CardImpl { public KaradorGhostChieftain(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Centaur"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/k/Karakas.java b/Mage.Sets/src/mage/cards/k/Karakas.java index aa897aa1721..9f39d1a2d1a 100644 --- a/Mage.Sets/src/mage/cards/k/Karakas.java +++ b/Mage.Sets/src/mage/cards/k/Karakas.java @@ -27,9 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,11 +34,15 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman @@ -55,7 +56,7 @@ public class Karakas extends CardImpl { public Karakas(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {W} to your mana pool. this.addAbility(new WhiteManaAbility()); diff --git a/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java b/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java index d417a9881b2..d12b34eec2d 100644 --- a/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java +++ b/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; @@ -47,6 +47,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -63,7 +65,7 @@ public class KarametraGodOfHarvests extends CardImpl { public KarametraGodOfHarvests(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{3}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java b/Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java index d9ac3f53f1b..2e93745f475 100644 --- a/Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java +++ b/Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; @@ -52,7 +53,7 @@ public class KariZevSkyshipRaider extends CardImpl { public KariZevSkyshipRaider(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Pirate"); this.power = new MageInt(1); @@ -111,7 +112,7 @@ class RagavanToken extends Token { RagavanToken() { super("Ragavan", "legendary 2/1 red Monkey creature token named Ragavan"); this.setOriginalExpansionSetCode("AER"); - this.getSupertype().add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.getPower().modifyBaseValue(2); this.getToughness().modifyBaseValue(1); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java b/Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java index 78ae2905edc..18ecdde8ef2 100644 --- a/Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java +++ b/Mage.Sets/src/mage/cards/k/KarlovOfTheGhostCouncil.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.GainLifeControllerTriggeredAbility; @@ -39,10 +38,13 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -51,7 +53,7 @@ public class KarlovOfTheGhostCouncil extends CardImpl { public KarlovOfTheGhostCouncil(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KarnLiberated.java b/Mage.Sets/src/mage/cards/k/KarnLiberated.java index d6ef1c1179e..5e08e65dfbc 100644 --- a/Mage.Sets/src/mage/cards/k/KarnLiberated.java +++ b/Mage.Sets/src/mage/cards/k/KarnLiberated.java @@ -121,7 +121,7 @@ class KarnLiberatedEffect extends OneShotEffect { for (ExileZone zone : game.getExile().getExileZones()) { if (zone.getId().equals(exileId)) { for (Card card : zone.getCards(game)) { - if (!card.getSubtype(game).contains("Aura") && CardUtil.isPermanentCard(card)) { + if (!card.getSubtype(game).contains("Aura") && card.isPermanent()) { cards.add(card); } } @@ -153,7 +153,7 @@ class KarnLiberatedEffect extends OneShotEffect { } for (Card card : cards) { game.getState().setZone(card.getId(), Zone.EXILED); - if (CardUtil.isPermanentCard(card) && !card.getSubtype(game).contains("Aura")) { + if (card.isPermanent() && !card.getSubtype(game).contains("Aura")) { game.getExile().add(exileId, sourceObject.getIdName(), card); } } diff --git a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java index 0b7ca302e57..759fe434d39 100644 --- a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java +++ b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; @@ -37,12 +36,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -50,6 +44,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +60,7 @@ public class KarnSilverGolem extends CardImpl { public KarnSilverGolem(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Golem"); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/k/KaronaFalseGod.java b/Mage.Sets/src/mage/cards/k/KaronaFalseGod.java index af47e2a10e5..c90e50cde75 100644 --- a/Mage.Sets/src/mage/cards/k/KaronaFalseGod.java +++ b/Mage.Sets/src/mage/cards/k/KaronaFalseGod.java @@ -43,11 +43,7 @@ import mage.cards.CardSetInfo; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -63,7 +59,7 @@ public class KaronaFalseGod extends CardImpl { public KaronaFalseGod(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Avatar"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java b/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java index 7edc71d66ff..e1242e549ae 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedTriggeredAbility; @@ -35,8 +34,11 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes @@ -45,7 +47,7 @@ public class KarplusanWolverine extends CardImpl { public KarplusanWolverine(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Wolverine"); this.subtype.add("Beast"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java b/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java index 71686348176..97b7998584f 100644 --- a/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java +++ b/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java @@ -41,12 +41,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -70,7 +65,7 @@ public class KarrthusTyrantOfJund extends CardImpl { public KarrthusTyrantOfJund(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java b/Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java index 3a79e55ca6e..07634706793 100644 --- a/Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java +++ b/Mage.Sets/src/mage/cards/k/KasetoOrochiArchmage.java @@ -28,6 +28,7 @@ package mage.cards.k; import java.util.UUID; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,23 +38,19 @@ import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -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.TargetCreaturePermanent; /** - * * @author fireshoes */ public class KasetoOrochiArchmage extends CardImpl { public KasetoOrochiArchmage(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{U}"); - this.supertype.add("Legendary"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{U}"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Snake"); this.subtype.add("Wizard"); this.power = new MageInt(2); @@ -97,7 +94,7 @@ class KasetoEffect extends OneShotEffect { if (permanent != null) { game.addEffect(new CantBeBlockedTargetEffect(Duration.EndOfTurn), source); if (permanent.getSubtype(game).contains("Snake")) { - game.addEffect(new BoostTargetEffect(2,2,Duration.EndOfTurn), source); + game.addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn), source); } return true; } diff --git a/Mage.Sets/src/mage/cards/k/KasimirTheLoneWolf.java b/Mage.Sets/src/mage/cards/k/KasimirTheLoneWolf.java index ca5ef66d45f..624d518174f 100644 --- a/Mage.Sets/src/mage/cards/k/KasimirTheLoneWolf.java +++ b/Mage.Sets/src/mage/cards/k/KasimirTheLoneWolf.java @@ -27,11 +27,13 @@ */ package mage.cards.k; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class KasimirTheLoneWolf extends CardImpl { public KasimirTheLoneWolf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java b/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java index e5fa00d5396..19e631fc7c2 100644 --- a/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java +++ b/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java @@ -57,7 +57,7 @@ public class KatakiWarsWage extends CardImpl { public KatakiWarsWage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/Kaysa.java b/Mage.Sets/src/mage/cards/k/Kaysa.java index e0d8dc095ad..28eda5f9df5 100644 --- a/Mage.Sets/src/mage/cards/k/Kaysa.java +++ b/Mage.Sets/src/mage/cards/k/Kaysa.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -36,10 +35,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class Kaysa extends CardImpl { public Kaysa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java b/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java index d72354ef415..945c3b41878 100644 --- a/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java +++ b/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java @@ -27,8 +27,6 @@ */ package mage.cards.k; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -48,6 +47,9 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.Objects; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -56,7 +58,7 @@ public class KazuulTyrantOfTheCliffs extends CardImpl { public KazuulTyrantOfTheCliffs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ogre"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/k/KeiTakahashi.java b/Mage.Sets/src/mage/cards/k/KeiTakahashi.java index c32fd8aefa5..69537eca1ac 100644 --- a/Mage.Sets/src/mage/cards/k/KeiTakahashi.java +++ b/Mage.Sets/src/mage/cards/k/KeiTakahashi.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +36,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -48,7 +50,7 @@ public class KeiTakahashi extends CardImpl { public KeiTakahashi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KeigaTheTideStar.java b/Mage.Sets/src/mage/cards/k/KeigaTheTideStar.java index 9d2798b0b8f..f298ce4010c 100644 --- a/Mage.Sets/src/mage/cards/k/KeigaTheTideStar.java +++ b/Mage.Sets/src/mage/cards/k/KeigaTheTideStar.java @@ -28,9 +28,6 @@ package mage.cards.k; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -38,9 +35,13 @@ import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author Loki */ @@ -48,7 +49,7 @@ public class KeigaTheTideStar extends CardImpl { public KeigaTheTideStar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java b/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java index 893db65236f..4c9605b0d9e 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java +++ b/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,11 +37,14 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Plopman @@ -51,7 +53,7 @@ public class KeldonNecropolis extends CardImpl { public KeldonNecropolis(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/k/KembaKhaRegent.java b/Mage.Sets/src/mage/cards/k/KembaKhaRegent.java index 4b8714597c7..92f101e9796 100644 --- a/Mage.Sets/src/mage/cards/k/KembaKhaRegent.java +++ b/Mage.Sets/src/mage/cards/k/KembaKhaRegent.java @@ -27,18 +27,19 @@ */ package mage.cards.k; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.EquipmentAttachedCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.TargetController; import mage.game.permanent.token.CatToken; +import java.util.UUID; + /** * * @author Loki, North @@ -47,7 +48,7 @@ public class KembaKhaRegent extends CardImpl { public KembaKhaRegent(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cat"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java index 27b9d5e4d6d..bfcaab96b90 100644 --- a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java +++ b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java @@ -27,8 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,17 +39,14 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * @author LevelX2 */ @@ -59,7 +54,7 @@ public class KentaroTheSmilingCat extends CardImpl { public KentaroTheSmilingCat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java b/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java index e3e612c468b..167a26e335b 100644 --- a/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java +++ b/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +43,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -53,6 +53,8 @@ import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.CardsAmountDrawnThisTurnWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +64,7 @@ public class KeranosGodOfStorms extends CardImpl { public KeranosGodOfStorms(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/k/KherKeep.java b/Mage.Sets/src/mage/cards/k/KherKeep.java index f4a96e92412..318995d19f4 100644 --- a/Mage.Sets/src/mage/cards/k/KherKeep.java +++ b/Mage.Sets/src/mage/cards/k/KherKeep.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +37,12 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,7 +51,7 @@ public class KherKeep extends CardImpl { public KherKeep(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/k/KiAdiMundi.java b/Mage.Sets/src/mage/cards/k/KiAdiMundi.java index cf19b2b3902..d04304dbc4a 100644 --- a/Mage.Sets/src/mage/cards/k/KiAdiMundi.java +++ b/Mage.Sets/src/mage/cards/k/KiAdiMundi.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,12 +35,15 @@ import mage.abilities.keyword.MeditateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author Styxo @@ -57,7 +59,7 @@ public class KiAdiMundi extends CardImpl { public KiAdiMundi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cerean"); this.subtype.add("Jedi"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java index 74aec5ab29d..89cdbcd9b92 100644 --- a/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java +++ b/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -50,6 +50,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jonubuu @@ -64,7 +66,7 @@ public class KikiJikiMirrorBreaker extends CardImpl { public KikiJikiMirrorBreaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java b/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java index fb20ab94fbf..c148a55e7c0 100644 --- a/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java +++ b/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java @@ -28,10 +28,6 @@ package mage.cards.k; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,11 +36,16 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX @@ -53,7 +54,7 @@ public class KikuNightsFlower extends CardImpl { public KikuNightsFlower (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Assassin"); diff --git a/Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java b/Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java index eeaf04e813c..17ab8f8599c 100644 --- a/Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java +++ b/Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.InspiredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.permanent.token.GoldToken; import mage.target.common.TargetCreaturePermanent; @@ -48,7 +49,7 @@ public class KingMacarTheGoldCursed extends CardImpl { public KingMacarTheGoldCursed(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KiraGreatGlassSpinner.java b/Mage.Sets/src/mage/cards/k/KiraGreatGlassSpinner.java index 1aea9d014c3..fccfb47523f 100644 --- a/Mage.Sets/src/mage/cards/k/KiraGreatGlassSpinner.java +++ b/Mage.Sets/src/mage/cards/k/KiraGreatGlassSpinner.java @@ -27,9 +27,6 @@ */ package mage.cards.k; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.TriggeredAbilityImpl; @@ -40,10 +37,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -52,6 +46,10 @@ import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * * @author LevelX2 @@ -61,7 +59,7 @@ public class KiraGreatGlassSpinner extends CardImpl { public KiraGreatGlassSpinner(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); this.subtype.add("Spirit"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KitsuneHealer.java b/Mage.Sets/src/mage/cards/k/KitsuneHealer.java index 5c3dc8a4dac..9fd707d6981 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneHealer.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneHealer.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -53,7 +54,7 @@ public class KitsuneHealer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public KitsuneHealer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java index 72dc2e28fb6..8aeabd77d52 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicate; @@ -52,6 +52,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -95,7 +97,7 @@ class AutumnTailKitsuneSage extends Token { AutumnTailKitsuneSage() { super("Autumn-Tail, Kitsune Sage", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add("Fox"); diff --git a/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java b/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java index 2bbee234f8b..ab50e4756e0 100644 --- a/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java +++ b/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java @@ -48,6 +48,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -61,7 +62,7 @@ public class KiyomaroFirstToStand extends CardImpl { public KiyomaroFirstToStand(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java b/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java index b4e290e2a97..0e9217453f1 100644 --- a/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java +++ b/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +57,7 @@ public class KodamaOfTheCenterTree extends CardImpl { public KodamaOfTheCenterTree(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/k/KodamaOfTheNorthTree.java b/Mage.Sets/src/mage/cards/k/KodamaOfTheNorthTree.java index 0cc8870d2c8..19019471802 100644 --- a/Mage.Sets/src/mage/cards/k/KodamaOfTheNorthTree.java +++ b/Mage.Sets/src/mage/cards/k/KodamaOfTheNorthTree.java @@ -28,13 +28,15 @@ package mage.cards.k; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class KodamaOfTheNorthTree extends CardImpl { public KodamaOfTheNorthTree (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/k/KodamaOfTheSouthTree.java b/Mage.Sets/src/mage/cards/k/KodamaOfTheSouthTree.java index 959f3f2cef3..50370f58378 100644 --- a/Mage.Sets/src/mage/cards/k/KodamaOfTheSouthTree.java +++ b/Mage.Sets/src/mage/cards/k/KodamaOfTheSouthTree.java @@ -28,9 +28,6 @@ package mage.cards.k; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -39,10 +36,14 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterSpiritOrArcaneCard; +import java.util.UUID; + /** * @author Loki */ @@ -52,7 +53,7 @@ public class KodamaOfTheSouthTree extends CardImpl { public KodamaOfTheSouthTree(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/k/KokushoTheEveningStar.java b/Mage.Sets/src/mage/cards/k/KokushoTheEveningStar.java index 442ae0997ff..b16486f5cae 100644 --- a/Mage.Sets/src/mage/cards/k/KokushoTheEveningStar.java +++ b/Mage.Sets/src/mage/cards/k/KokushoTheEveningStar.java @@ -28,9 +28,6 @@ package mage.cards.k; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -38,9 +35,13 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.game.Game; +import java.util.UUID; + /** * @author Loki */ @@ -48,7 +49,7 @@ public class KokushoTheEveningStar extends CardImpl { public KokushoTheEveningStar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java b/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java index a1983daa446..7f01ab59191 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java @@ -35,10 +35,7 @@ import mage.abilities.keyword.DashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -58,7 +55,7 @@ public class KolaghanTheStormsFury extends CardImpl { public KolaghanTheStormsFury(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/k/KondaLordOfEiganjo.java b/Mage.Sets/src/mage/cards/k/KondaLordOfEiganjo.java index 768d7974235..5c92c841f2a 100644 --- a/Mage.Sets/src/mage/cards/k/KondaLordOfEiganjo.java +++ b/Mage.Sets/src/mage/cards/k/KondaLordOfEiganjo.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.IndestructibleAbility; @@ -35,6 +34,9 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @author Loki @@ -43,7 +45,7 @@ public class KondaLordOfEiganjo extends CardImpl { public KondaLordOfEiganjo(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/k/KondasBanner.java b/Mage.Sets/src/mage/cards/k/KondasBanner.java index 04b1bbe2281..f74e32d7cea 100644 --- a/Mage.Sets/src/mage/cards/k/KondasBanner.java +++ b/Mage.Sets/src/mage/cards/k/KondasBanner.java @@ -38,10 +38,7 @@ import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -65,7 +62,7 @@ public class KondasBanner extends CardImpl { public KondasBanner(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); Target target = new TargetControlledCreaturePermanent(1, 1, legendaryFilter, false); diff --git a/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java b/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java index 79d2697990f..6f826dead58 100644 --- a/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java +++ b/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -35,8 +34,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -45,7 +47,7 @@ public class KongmingSleepingDragon extends CardImpl { public KongmingSleepingDragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/k/KorHaven.java b/Mage.Sets/src/mage/cards/k/KorHaven.java index b41792b5a1a..132fb5ae7dc 100644 --- a/Mage.Sets/src/mage/cards/k/KorHaven.java +++ b/Mage.Sets/src/mage/cards/k/KorHaven.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,9 +38,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author emerald000 @@ -50,7 +52,7 @@ public class KorHaven extends CardImpl { public KorHaven(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java index f725e53fbdd..d8d589df0ba 100644 --- a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java +++ b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.GrandeurAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; @@ -49,6 +49,8 @@ import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author emerald000 @@ -64,7 +66,7 @@ public class KorlashHeirToBlackblade extends CardImpl { public KorlashHeirToBlackblade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/k/KoskunFalls.java b/Mage.Sets/src/mage/cards/k/KoskunFalls.java index 0c9d83eb779..bc3bd3971d9 100644 --- a/Mage.Sets/src/mage/cards/k/KoskunFalls.java +++ b/Mage.Sets/src/mage/cards/k/KoskunFalls.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.combat.CantAttackYouUnlessPayManaAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -59,7 +60,7 @@ public class KoskunFalls extends CardImpl { public KoskunFalls(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // At the beginning of your upkeep, sacrifice Koskun Falls unless you tap an untapped creature you control. Effect effect = new SacrificeSourceUnlessPaysEffect(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filterCreature, true))); diff --git a/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java b/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java index 2831cec1d70..4a28d614852 100644 --- a/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java +++ b/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +39,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; @@ -49,6 +49,8 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -63,7 +65,7 @@ public class KothophedSoulHoarder extends CardImpl { public KothophedSoulHoarder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/k/KozilekButcherOfTruth.java b/Mage.Sets/src/mage/cards/k/KozilekButcherOfTruth.java index cde154abb2d..0b7a08c72f3 100644 --- a/Mage.Sets/src/mage/cards/k/KozilekButcherOfTruth.java +++ b/Mage.Sets/src/mage/cards/k/KozilekButcherOfTruth.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.PutIntoGraveFromAnywhereSourceTriggeredAbility; import mage.abilities.effects.common.CastSourceTriggeredAbility; @@ -37,6 +36,9 @@ import mage.abilities.keyword.AnnihilatorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -46,7 +48,7 @@ public class KozilekButcherOfTruth extends CardImpl { public KozilekButcherOfTruth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{10}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Eldrazi"); this.power = new MageInt(12); this.toughness = new MageInt(12); diff --git a/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java b/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java index a69f7b124ba..470978d5768 100644 --- a/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java +++ b/Mage.Sets/src/mage/cards/k/KozilekTheGreatDistortion.java @@ -27,9 +27,6 @@ */ package mage.cards.k; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -47,6 +44,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; @@ -59,6 +57,10 @@ import mage.players.Player; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -67,7 +69,7 @@ public class KozilekTheGreatDistortion extends CardImpl { public KozilekTheGreatDistortion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{8}{C}{C}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Eldrazi"); this.power = new MageInt(12); this.toughness = new MageInt(12); diff --git a/Mage.Sets/src/mage/cards/k/KrarksThumb.java b/Mage.Sets/src/mage/cards/k/KrarksThumb.java index eac2364d634..f3e32dab75a 100644 --- a/Mage.Sets/src/mage/cards/k/KrarksThumb.java +++ b/Mage.Sets/src/mage/cards/k/KrarksThumb.java @@ -33,10 +33,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -50,7 +47,7 @@ public class KrarksThumb extends CardImpl { public KrarksThumb(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // If you would flip a coin, instead flip two coins and ignore one. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KrarksThumbEffect())); diff --git a/Mage.Sets/src/mage/cards/k/KraumLudevicsOpus.java b/Mage.Sets/src/mage/cards/k/KraumLudevicsOpus.java index 03dc443a9f3..67dde9e079d 100644 --- a/Mage.Sets/src/mage/cards/k/KraumLudevicsOpus.java +++ b/Mage.Sets/src/mage/cards/k/KraumLudevicsOpus.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -37,12 +36,15 @@ import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.watchers.common.CastSpellLastTurnWatcher; +import java.util.UUID; + /** * * @author Styxo @@ -52,7 +54,7 @@ public class KraumLudevicsOpus extends CardImpl { public KraumLudevicsOpus(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Horror"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java b/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java index b9393700443..aee626317fc 100644 --- a/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java +++ b/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java @@ -27,9 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,10 +34,15 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinToken; +import java.util.UUID; + /** * * @author North @@ -55,7 +57,7 @@ public class KrenkoMobBoss extends CardImpl { public KrenkoMobBoss(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/k/KreshTheBloodbraided.java b/Mage.Sets/src/mage/cards/k/KreshTheBloodbraided.java index 18404963335..5853b4ac0c5 100644 --- a/Mage.Sets/src/mage/cards/k/KreshTheBloodbraided.java +++ b/Mage.Sets/src/mage/cards/k/KreshTheBloodbraided.java @@ -37,6 +37,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -50,7 +51,7 @@ public class KreshTheBloodbraided extends CardImpl { public KreshTheBloodbraided(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/k/KrondTheDawnClad.java b/Mage.Sets/src/mage/cards/k/KrondTheDawnClad.java index 3c1f2796372..e8765707fd1 100644 --- a/Mage.Sets/src/mage/cards/k/KrondTheDawnClad.java +++ b/Mage.Sets/src/mage/cards/k/KrondTheDawnClad.java @@ -39,6 +39,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.target.TargetPermanent; /** @@ -49,7 +50,7 @@ public class KrondTheDawnClad extends CardImpl { public KrondTheDawnClad(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{G}{G}{W}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Archon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/k/KruphixGodOfHorizons.java b/Mage.Sets/src/mage/cards/k/KruphixGodOfHorizons.java index 7465d7bf698..273983123a3 100644 --- a/Mage.Sets/src/mage/cards/k/KruphixGodOfHorizons.java +++ b/Mage.Sets/src/mage/cards/k/KruphixGodOfHorizons.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,14 +38,12 @@ import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +52,7 @@ public class KruphixGodOfHorizons extends CardImpl { public KruphixGodOfHorizons(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java index 54888f85005..949b5bb379e 100644 --- a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; import mage.watchers.common.DamagedByWatcher; @@ -53,7 +54,7 @@ public class KumanoMasterYamabushi extends CardImpl { public KumanoMasterYamabushi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java b/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java index 2baa771744e..86a11817c97 100644 --- a/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java +++ b/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -45,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.token.Token; import mage.watchers.common.CreaturesDiedWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class KuonOgreAscendant extends CardImpl { public KuonOgreAscendant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ogre"); this.subtype.add("Monk"); @@ -87,7 +89,7 @@ class KuonsEssenceToken extends Token { KuonsEssenceToken() { super("Kuon's Essence", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.ENCHANTMENT); color.setBlack(true); diff --git a/Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java b/Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java index 72aff27d39c..a3202dd9a53 100644 --- a/Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java +++ b/Mage.Sets/src/mage/cards/k/KurkeshOnakkeAncient.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -38,10 +37,7 @@ import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -49,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.game.stack.StackAbility; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 @@ -57,7 +55,7 @@ public class KurkeshOnakkeAncient extends CardImpl { public KurkeshOnakkeAncient(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ogre"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/k/KuroPitlord.java b/Mage.Sets/src/mage/cards/k/KuroPitlord.java index 3d88680a738..91044836b27 100644 --- a/Mage.Sets/src/mage/cards/k/KuroPitlord.java +++ b/Mage.Sets/src/mage/cards/k/KuroPitlord.java @@ -50,7 +50,7 @@ public class KuroPitlord extends CardImpl { public KuroPitlord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/k/KydeleChosenOfKruphix.java b/Mage.Sets/src/mage/cards/k/KydeleChosenOfKruphix.java index 309e8c6d148..09034063820 100644 --- a/Mage.Sets/src/mage/cards/k/KydeleChosenOfKruphix.java +++ b/Mage.Sets/src/mage/cards/k/KydeleChosenOfKruphix.java @@ -27,11 +27,6 @@ */ package mage.cards.k; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -43,11 +38,14 @@ import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; +import java.util.*; + /** * * @author spjspj @@ -57,7 +55,7 @@ public class KydeleChosenOfKruphix extends CardImpl { public KydeleChosenOfKruphix(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java b/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java index d56c6acce5f..1754da6a4d6 100644 --- a/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java +++ b/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java @@ -34,10 +34,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; @@ -60,7 +57,7 @@ public class KynaiosAndTiroOfMeletis extends CardImpl { public KynaiosAndTiroOfMeletis(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{G}{W}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KyokiSanitysEclipse.java b/Mage.Sets/src/mage/cards/k/KyokiSanitysEclipse.java index 8e1d8077a34..4dc2693b8da 100644 --- a/Mage.Sets/src/mage/cards/k/KyokiSanitysEclipse.java +++ b/Mage.Sets/src/mage/cards/k/KyokiSanitysEclipse.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -35,11 +34,14 @@ import mage.abilities.effects.common.ExileFromZoneTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 @@ -48,7 +50,7 @@ public class KyokiSanitysEclipse extends CardImpl { public KyokiSanitysEclipse(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java b/Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java index bceb978d51c..ebd9fdf4ca6 100644 --- a/Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java +++ b/Mage.Sets/src/mage/cards/k/KytheonHeroOfAkros.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -46,11 +45,14 @@ import mage.cards.CardSetInfo; import mage.cards.g.GideonBattleForged; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.watchers.common.AttackedOrBlockedThisCombatWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +61,7 @@ public class KytheonHeroOfAkros extends CardImpl { public KytheonHeroOfAkros(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/l/LadyCaleria.java b/Mage.Sets/src/mage/cards/l/LadyCaleria.java index c01b20e1d90..f459e991682 100644 --- a/Mage.Sets/src/mage/cards/l/LadyCaleria.java +++ b/Mage.Sets/src/mage/cards/l/LadyCaleria.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -36,9 +35,12 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author LoneFox @@ -47,7 +49,7 @@ public class LadyCaleria extends CardImpl { public LadyCaleria(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Archer"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/l/LadyEvangela.java b/Mage.Sets/src/mage/cards/l/LadyEvangela.java index 068905de64a..a2f5d5d9fa0 100644 --- a/Mage.Sets/src/mage/cards/l/LadyEvangela.java +++ b/Mage.Sets/src/mage/cards/l/LadyEvangela.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +51,7 @@ public class LadyEvangela extends CardImpl { public LadyEvangela(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/l/LadyOrca.java b/Mage.Sets/src/mage/cards/l/LadyOrca.java index d0e09005395..6e8820d75a5 100644 --- a/Mage.Sets/src/mage/cards/l/LadyOrca.java +++ b/Mage.Sets/src/mage/cards/l/LadyOrca.java @@ -27,11 +27,13 @@ */ package mage.cards.l; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class LadyOrca extends CardImpl { public LadyOrca(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/l/LadySun.java b/Mage.Sets/src/mage/cards/l/LadySun.java index 64bb00f5b0d..d988b831f6f 100644 --- a/Mage.Sets/src/mage/cards/l/LadySun.java +++ b/Mage.Sets/src/mage/cards/l/LadySun.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -57,7 +58,7 @@ public class LadySun extends CardImpl { public LadySun(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/l/LadyZhurongWarriorQueen.java b/Mage.Sets/src/mage/cards/l/LadyZhurongWarriorQueen.java index ad5a763ca2f..cf8da63fe6f 100644 --- a/Mage.Sets/src/mage/cards/l/LadyZhurongWarriorQueen.java +++ b/Mage.Sets/src/mage/cards/l/LadyZhurongWarriorQueen.java @@ -27,12 +27,14 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class LadyZhurongWarriorQueen extends CardImpl { public LadyZhurongWarriorQueen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/l/LandoCalrissian.java b/Mage.Sets/src/mage/cards/l/LandoCalrissian.java index 55ca7cf1159..933ff4978f8 100644 --- a/Mage.Sets/src/mage/cards/l/LandoCalrissian.java +++ b/Mage.Sets/src/mage/cards/l/LandoCalrissian.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.Effect; @@ -39,12 +38,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -60,7 +62,7 @@ public class LandoCalrissian extends CardImpl { public LandoCalrissian(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java b/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java index 1272e71fd95..25cb74833b8 100644 --- a/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java +++ b/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; @@ -52,7 +53,7 @@ public class LatullaKeldonOverseer extends CardImpl { public LatullaKeldonOverseer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Spellshaper"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java b/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java index 66a544476a8..331ac20b7f8 100644 --- a/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java +++ b/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.DetainAllEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.Filter; import mage.filter.FilterPermanent; @@ -63,7 +64,7 @@ public class LaviniaOfTheTenth extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{U}"); this.subtype.add("Human"); this.subtype.add("Soldier"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/l/LazavDimirMastermind.java b/Mage.Sets/src/mage/cards/l/LazavDimirMastermind.java index 60ca447520a..89238d190cc 100644 --- a/Mage.Sets/src/mage/cards/l/LazavDimirMastermind.java +++ b/Mage.Sets/src/mage/cards/l/LazavDimirMastermind.java @@ -38,11 +38,7 @@ import mage.abilities.keyword.HexproofAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; @@ -59,7 +55,7 @@ public class LazavDimirMastermind extends CardImpl { public LazavDimirMastermind(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}{U}{B}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Shapeshifter"); this.power = new MageInt(3); @@ -137,7 +133,7 @@ class LazavDimirMastermindApplier extends ApplyToPermanent { TargetController.OPPONENT, SetTargetPointer.CARD); permanent.getAbilities().add(ability); permanent.setName("Lazav, Dimir Mastermind"); - permanent.getSupertype().add("Legendary"); + permanent.addSuperType(SuperType.LEGENDARY); permanent.getAbilities().add(HexproofAbility.getInstance()); return true; } @@ -150,7 +146,7 @@ class LazavDimirMastermindApplier extends ApplyToPermanent { TargetController.OPPONENT, SetTargetPointer.CARD); mageObject.getAbilities().add(ability); mageObject.setName("Lazav, Dimir Mastermind"); - mageObject.getSupertype().add("Legendary"); + mageObject.addSuperType(SuperType.LEGENDARY); mageObject.getAbilities().add(HexproofAbility.getInstance()); return true; } diff --git a/Mage.Sets/src/mage/cards/l/LegacyWeapon.java b/Mage.Sets/src/mage/cards/l/LegacyWeapon.java index 7c786446519..7c41f1a325c 100644 --- a/Mage.Sets/src/mage/cards/l/LegacyWeapon.java +++ b/Mage.Sets/src/mage/cards/l/LegacyWeapon.java @@ -29,6 +29,7 @@ package mage.cards.l; import java.util.UUID; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.abilities.common.PutIntoGraveFromAnywhereSourceAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -47,7 +48,7 @@ public class LegacyWeapon extends CardImpl { public LegacyWeapon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{7}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); // {W}{U}{B}{R}{G}: Exile target permanent. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java b/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java index c1132783592..86360cee20f 100644 --- a/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java +++ b/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java @@ -51,7 +51,7 @@ public class LeovoldEmissaryOfTrest extends CardImpl { public LeovoldEmissaryOfTrest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Advisor"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java b/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java index 47d13cc68ee..91c380d3683 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java @@ -35,12 +35,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.LeylineAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -103,9 +98,8 @@ class SetSupertypeAllEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - if (!permanent.getSupertype().contains("Legendary")) { - permanent.getSupertype().add("Legendary"); - } + permanent.addSuperType(SuperType.LEGENDARY); + } return true; } diff --git a/Mage.Sets/src/mage/cards/l/LieutenantKirtar.java b/Mage.Sets/src/mage/cards/l/LieutenantKirtar.java index b8c42ab8f83..741289be364 100644 --- a/Mage.Sets/src/mage/cards/l/LieutenantKirtar.java +++ b/Mage.Sets/src/mage/cards/l/LieutenantKirtar.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetAttackingCreature; @@ -49,7 +50,7 @@ public class LieutenantKirtar extends CardImpl { public LieutenantKirtar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Bird"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java index a784534fbcf..2b7cc860ba6 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Gender; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -38,6 +37,7 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -46,6 +46,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ZombieToken; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +64,7 @@ public class LilianaHereticalHealer extends CardImpl { public LilianaHereticalHealer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java index b4d1e84a783..69764d9802b 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java +++ b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -41,11 +40,7 @@ import mage.abilities.effects.common.continuous.AddCardSubTypeTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -56,6 +51,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -72,7 +69,7 @@ public class LimDulTheNecromancer extends CardImpl { public LimDulTheNecromancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java index dbc0f834527..3962a517c89 100644 --- a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java +++ b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java @@ -39,10 +39,7 @@ import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter.ComparisonType; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; @@ -71,7 +68,7 @@ public class LinSivviDefiantHero extends CardImpl { public LinSivviDefiantHero(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rebel"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java b/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java index 11275a9a6bd..05687cad4b2 100644 --- a/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java +++ b/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterControlledPermanent; @@ -65,7 +66,7 @@ public class LinessaZephyrMage extends CardImpl { public LinessaZephyrMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java b/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java index 8dce1d64f44..5e7342810b2 100644 --- a/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java +++ b/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +51,7 @@ public class LinvalaKeeperOfSilence extends CardImpl { public LinvalaKeeperOfSilence(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java b/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java index cb0e2e8cb97..63d2c485af9 100644 --- a/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java +++ b/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.OpponentControlsMoreCondition; @@ -39,9 +38,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes @@ -50,7 +52,7 @@ public class LinvalaThePreserver extends CardImpl { public LinvalaThePreserver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java b/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java index ee3970a6f23..f00b147a5ea 100644 --- a/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java +++ b/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -38,11 +37,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; +import java.util.UUID; + /** * * @author LoneFox @@ -58,7 +60,7 @@ public class LiuBeiLordOfShu extends CardImpl { public LiuBeiLordOfShu(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/l/LivingPlane.java b/Mage.Sets/src/mage/cards/l/LivingPlane.java index 91d6f49743d..f1f0d84a0cc 100644 --- a/Mage.Sets/src/mage/cards/l/LivingPlane.java +++ b/Mage.Sets/src/mage/cards/l/LivingPlane.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.game.permanent.token.Token; @@ -47,7 +48,7 @@ public class LivingPlane extends CardImpl { public LivingPlane(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); - this.supertype.add("World"); + this.addSuperType(SuperType.WORLD); // All lands are 1/1 creatures that are still lands. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect(new LivingPlaneToken(), "lands", new FilterLandPermanent("lands"), Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/l/LivonyaSilone.java b/Mage.Sets/src/mage/cards/l/LivonyaSilone.java index d3bac243f90..c0cfd725a90 100644 --- a/Mage.Sets/src/mage/cards/l/LivonyaSilone.java +++ b/Mage.Sets/src/mage/cards/l/LivonyaSilone.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.LandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -46,12 +47,12 @@ public class LivonyaSilone extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Legendary land"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public LivonyaSilone(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{G}{G}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java index f1bcb71244f..487ac653c31 100644 --- a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java +++ b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -39,11 +38,7 @@ import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -53,6 +48,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -69,7 +66,7 @@ public class LlawanCephalidEmpress extends CardImpl { public LlawanCephalidEmpress(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cephalid"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java b/Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java index 6548339fda2..f6d1b1aa67b 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTresserhorn.java @@ -41,6 +41,7 @@ import mage.abilities.effects.common.SacrificeControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetOpponent; @@ -53,7 +54,7 @@ public class LordOfTresserhorn extends CardImpl { public LordOfTresserhorn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{B}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.power = new MageInt(10); diff --git a/Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java b/Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java index 9da70d6c6cd..60d1f7b2ff0 100644 --- a/Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java +++ b/Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -38,9 +37,12 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -51,7 +53,7 @@ public class LorthosTheTidemaker extends CardImpl { public LorthosTheTidemaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Octopus"); this.power = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java b/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java index 171cab80704..565341cbddb 100644 --- a/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java +++ b/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,11 +38,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox @@ -58,7 +60,7 @@ public class LovisaColdeyes extends CardImpl { public LovisaColdeyes(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/l/LuBuMasterAtArms.java b/Mage.Sets/src/mage/cards/l/LuBuMasterAtArms.java index b046e3de6a2..542385ed554 100644 --- a/Mage.Sets/src/mage/cards/l/LuBuMasterAtArms.java +++ b/Mage.Sets/src/mage/cards/l/LuBuMasterAtArms.java @@ -27,13 +27,15 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class LuBuMasterAtArms extends CardImpl { public LuBuMasterAtArms(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/l/LuMengWuGeneral.java b/Mage.Sets/src/mage/cards/l/LuMengWuGeneral.java index 5b52be75989..0d52da54046 100644 --- a/Mage.Sets/src/mage/cards/l/LuMengWuGeneral.java +++ b/Mage.Sets/src/mage/cards/l/LuMengWuGeneral.java @@ -27,12 +27,14 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class LuMengWuGeneral extends CardImpl { public LuMengWuGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/l/LuSuWuAdvisor.java b/Mage.Sets/src/mage/cards/l/LuSuWuAdvisor.java index 479a6d525b1..3bc4e2e24ce 100644 --- a/Mage.Sets/src/mage/cards/l/LuSuWuAdvisor.java +++ b/Mage.Sets/src/mage/cards/l/LuSuWuAdvisor.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -37,8 +36,11 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes @@ -47,7 +49,7 @@ public class LuSuWuAdvisor extends CardImpl { public LuSuWuAdvisor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/l/LuXunScholarGeneral.java b/Mage.Sets/src/mage/cards/l/LuXunScholarGeneral.java index adc14bc0af8..9539aeffeb9 100644 --- a/Mage.Sets/src/mage/cards/l/LuXunScholarGeneral.java +++ b/Mage.Sets/src/mage/cards/l/LuXunScholarGeneral.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -44,7 +45,7 @@ public class LuXunScholarGeneral extends CardImpl { public LuXunScholarGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java b/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java index bb323aeeaf6..93e646d334f 100644 --- a/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java +++ b/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java @@ -27,8 +27,6 @@ */ package mage.cards.l; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -37,15 +35,15 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.players.PlayerList; import mage.watchers.common.PlayerLostLifeWatcher; +import java.util.Objects; +import java.util.UUID; + /** * * @author spjspj @@ -55,7 +53,7 @@ public class LudevicNecroAlchemist extends CardImpl { public LudevicNecroAlchemist(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/l/LukeSkywalker.java b/Mage.Sets/src/mage/cards/l/LukeSkywalker.java index 4c2fbd0a2de..cb0dfa4e72a 100644 --- a/Mage.Sets/src/mage/cards/l/LukeSkywalker.java +++ b/Mage.Sets/src/mage/cards/l/LukeSkywalker.java @@ -43,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -64,7 +65,7 @@ public class LukeSkywalker extends CardImpl { public LukeSkywalker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Jedi"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java b/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java index 771f28b946c..7e6990978b9 100644 --- a/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java +++ b/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +42,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -51,6 +51,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Quercitron @@ -67,7 +69,7 @@ public class LyzoldaTheBloodWitch extends CardImpl { public LyzoldaTheBloodWitch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/m/MaChaoWesternWarrior.java b/Mage.Sets/src/mage/cards/m/MaChaoWesternWarrior.java index f3f1ef7798f..8dd4313ac17 100644 --- a/Mage.Sets/src/mage/cards/m/MaChaoWesternWarrior.java +++ b/Mage.Sets/src/mage/cards/m/MaChaoWesternWarrior.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksAloneTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,6 +36,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -46,7 +48,7 @@ public class MaChaoWesternWarrior extends CardImpl { public MaChaoWesternWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/m/MaceWindu.java b/Mage.Sets/src/mage/cards/m/MaceWindu.java index 044ab4cf0f7..b728f4b90e1 100644 --- a/Mage.Sets/src/mage/cards/m/MaceWindu.java +++ b/Mage.Sets/src/mage/cards/m/MaceWindu.java @@ -27,21 +27,23 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.keyword.FlashAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; +import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.MeditateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterSpellOrPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetSpellOrPermanent; +import java.util.UUID; + /** * * @author Styxo @@ -56,7 +58,7 @@ public class MaceWindu extends CardImpl { public MaceWindu(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Jedi"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java b/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java index 426d0016d9e..c765e2f10a6 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java @@ -29,9 +29,7 @@ package mage.cards.m; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -39,7 +37,6 @@ import mage.abilities.keyword.CascadeAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -56,7 +53,7 @@ public class MaelstromWanderer extends CardImpl { public MaelstromWanderer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/m/MagaTraitorToMortals.java b/Mage.Sets/src/mage/cards/m/MagaTraitorToMortals.java index 87cb2a28b9a..3b28f85f7c9 100644 --- a/Mage.Sets/src/mage/cards/m/MagaTraitorToMortals.java +++ b/Mage.Sets/src/mage/cards/m/MagaTraitorToMortals.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -38,9 +37,12 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,7 +51,7 @@ public class MagaTraitorToMortals extends CardImpl { public MagaTraitorToMortals(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{X}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/m/MagetaTheLion.java b/Mage.Sets/src/mage/cards/m/MagetaTheLion.java index 01ae411a254..7b0429d38a3 100644 --- a/Mage.Sets/src/mage/cards/m/MagetaTheLion.java +++ b/Mage.Sets/src/mage/cards/m/MagetaTheLion.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; @@ -45,6 +45,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author fireshoes @@ -60,7 +62,7 @@ public class MagetaTheLion extends CardImpl { public MagetaTheLion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Spellshaper"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/m/MajorTeroh.java b/Mage.Sets/src/mage/cards/m/MajorTeroh.java index 97846c4ba81..95b8b3107e7 100644 --- a/Mage.Sets/src/mage/cards/m/MajorTeroh.java +++ b/Mage.Sets/src/mage/cards/m/MajorTeroh.java @@ -27,9 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -40,10 +37,14 @@ import mage.abilities.effects.common.ExileAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +58,7 @@ public class MajorTeroh extends CardImpl { public MajorTeroh(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Bird"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/m/Malfegor.java b/Mage.Sets/src/mage/cards/m/Malfegor.java index e212dedf1eb..ea40ce5e5a0 100644 --- a/Mage.Sets/src/mage/cards/m/Malfegor.java +++ b/Mage.Sets/src/mage/cards/m/Malfegor.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -44,6 +44,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -52,7 +54,7 @@ public class Malfegor extends CardImpl { public Malfegor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.subtype.add("Dragon"); diff --git a/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java b/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java index c6d51f2a9c7..2ec9f4540ae 100644 --- a/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java +++ b/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +36,12 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author Plopman @@ -48,7 +50,7 @@ public class MangaraOfCorondor extends CardImpl { public MangaraOfCorondor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/m/MannichiTheFeveredDream.java b/Mage.Sets/src/mage/cards/m/MannichiTheFeveredDream.java index 0c4507c48ef..325c55bf10a 100644 --- a/Mage.Sets/src/mage/cards/m/MannichiTheFeveredDream.java +++ b/Mage.Sets/src/mage/cards/m/MannichiTheFeveredDream.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,8 +35,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -46,7 +48,7 @@ public class MannichiTheFeveredDream extends CardImpl { public MannichiTheFeveredDream(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java index d9e18642bf5..d935f351d7a 100644 --- a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java +++ b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfDrawTriggeredAbility; @@ -37,16 +36,14 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author andyfries @@ -55,7 +52,7 @@ public class MaralenOfTheMornsong extends CardImpl { public MaralenOfTheMornsong(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Wizard"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java index 6831b9686d3..441c18a40e4 100644 --- a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java +++ b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -49,6 +48,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -58,6 +58,8 @@ import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -66,7 +68,7 @@ public class MarathWillOfTheWild extends CardImpl { public MarathWillOfTheWild(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.subtype.add("Beast"); diff --git a/Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java b/Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java index 0387b91965a..32bd21b40b8 100644 --- a/Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java +++ b/Mage.Sets/src/mage/cards/m/MaraxusOfKeld.java @@ -27,14 +27,15 @@ */ package mage.cards.m; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -61,7 +62,7 @@ public class MaraxusOfKeld extends CardImpl { public MaraxusOfKeld(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java b/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java index e8d41d5a134..471f6500103 100644 --- a/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java +++ b/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -42,10 +41,7 @@ import mage.abilities.keyword.DethroneAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -55,6 +51,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -63,7 +61,7 @@ public class MarchesaTheBlackRose extends CardImpl { public MarchesaTheBlackRose(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/m/MarhaultElsdragon.java b/Mage.Sets/src/mage/cards/m/MarhaultElsdragon.java index 5fd053e0b35..71b9e20853e 100644 --- a/Mage.Sets/src/mage/cards/m/MarhaultElsdragon.java +++ b/Mage.Sets/src/mage/cards/m/MarhaultElsdragon.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.RampageAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -42,7 +43,7 @@ public class MarhaultElsdragon extends CardImpl { public MarhaultElsdragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java index f2969e06a2e..17a39ed1b87 100644 --- a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java +++ b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java @@ -31,6 +31,7 @@ package mage.cards.m; import java.util.UUID; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; @@ -70,7 +71,7 @@ public class MarrowGnawer extends CardImpl { public MarrowGnawer (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Rat"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/cards/m/MartonStromgald.java b/Mage.Sets/src/mage/cards/m/MartonStromgald.java index e2d3a1f4592..2db1ce696ce 100644 --- a/Mage.Sets/src/mage/cards/m/MartonStromgald.java +++ b/Mage.Sets/src/mage/cards/m/MartonStromgald.java @@ -27,19 +27,21 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.BlocksTriggeredAbility; +import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterBlockingCreature; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; + +import java.util.UUID; /** * @@ -57,7 +59,7 @@ public class MartonStromgald extends CardImpl { public MartonStromgald(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java b/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java index 8d752562f8a..b3457c4549a 100644 --- a/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java +++ b/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,14 +34,12 @@ import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -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.UUID; + /** * * @author LevelX2 @@ -51,7 +48,7 @@ public class MasakoTheHumorless extends CardImpl { public MasakoTheHumorless(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/m/MasumaroFirstToLive.java b/Mage.Sets/src/mage/cards/m/MasumaroFirstToLive.java index c0bd2d3a208..e48c75820c3 100644 --- a/Mage.Sets/src/mage/cards/m/MasumaroFirstToLive.java +++ b/Mage.Sets/src/mage/cards/m/MasumaroFirstToLive.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -39,8 +38,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,7 +51,7 @@ public class MasumaroFirstToLive extends CardImpl { public MasumaroFirstToLive(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java b/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java index 816e21a7d81..4ef91d9e143 100644 --- a/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java +++ b/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java @@ -27,9 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,11 +34,16 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.Filter.ComparisonType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author North @@ -56,7 +58,7 @@ public class MayaelTheAnima extends CardImpl { public MayaelTheAnima(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/m/MazirekKraulDeathPriest.java b/Mage.Sets/src/mage/cards/m/MazirekKraulDeathPriest.java index 1ec6f9bfc57..b4848a622b5 100644 --- a/Mage.Sets/src/mage/cards/m/MazirekKraulDeathPriest.java +++ b/Mage.Sets/src/mage/cards/m/MazirekKraulDeathPriest.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; @@ -37,6 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -44,6 +44,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author fireshoes @@ -52,7 +54,7 @@ public class MazirekKraulDeathPriest extends CardImpl { public MazirekKraulDeathPriest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Insect"); this.subtype.add("Shaman"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java b/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java index 96217279389..a01f2186021 100644 --- a/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java +++ b/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -42,9 +41,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class MedomaiTheAgeless extends CardImpl { public MedomaiTheAgeless(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Sphinx"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java b/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java index ab9b3d0a870..ac42abec2d5 100644 --- a/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java +++ b/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; @@ -37,9 +36,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 @@ -48,7 +50,7 @@ public class MeishinTheMindCage extends CardImpl { public MeishinTheMindCage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{U}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // All creatures get -X/-0, where X is the number of cards in your hand. diff --git a/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java b/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java index 463f669222b..51fe4cb0260 100644 --- a/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java +++ b/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.continuous.PlayWithTheTopCardRevealedEffect import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -48,6 +48,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -64,7 +66,7 @@ public class MelekIzzetParagon extends CardImpl { public MelekIzzetParagon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Weird"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java b/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java index 5c660b61d81..ff633528864 100644 --- a/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java +++ b/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java @@ -37,12 +37,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -58,7 +53,7 @@ public class MeliraSylvokOutcast extends CardImpl { public MeliraSylvokOutcast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Scout"); diff --git a/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java index 3d3057c3053..3d94028bc5c 100644 --- a/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java +++ b/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java @@ -28,9 +28,6 @@ package mage.cards.m; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,11 +37,16 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * @author Loki */ @@ -54,7 +56,7 @@ public class MelokuTheCloudedMirror extends CardImpl { public MelokuTheCloudedMirror(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Moonfolk"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/m/Memnarch.java b/Mage.Sets/src/mage/cards/m/Memnarch.java index 8f294808108..40186e50719 100644 --- a/Mage.Sets/src/mage/cards/m/Memnarch.java +++ b/Mage.Sets/src/mage/cards/m/Memnarch.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; @@ -52,7 +53,7 @@ public class Memnarch extends CardImpl { public Memnarch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{7}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Wizard"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java b/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java index 7fb7cd86b13..2657a4208e0 100644 --- a/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java +++ b/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java @@ -27,21 +27,19 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -57,7 +55,7 @@ public class MengHuoBarbarianKing extends CardImpl { public MengHuoBarbarianKing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Barbarian"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java index a115cefeaba..c7811c15365 100644 --- a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; @@ -38,10 +37,7 @@ import mage.abilities.effects.common.counter.AddCountersControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; @@ -52,6 +48,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes @@ -67,7 +65,7 @@ public class MerenOfClanNelToth extends CardImpl { public MerenOfClanNelToth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Shaman"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java b/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java index e900b981d5c..d819f9d8ed4 100644 --- a/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java +++ b/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java @@ -42,10 +42,7 @@ import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -63,7 +60,7 @@ public class MeriekeRiBerit extends CardImpl { public MeriekeRiBerit(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{U}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/m/MichikoKondaTruthSeeker.java b/Mage.Sets/src/mage/cards/m/MichikoKondaTruthSeeker.java index 1f5fe4d38d4..8cb83085251 100644 --- a/Mage.Sets/src/mage/cards/m/MichikoKondaTruthSeeker.java +++ b/Mage.Sets/src/mage/cards/m/MichikoKondaTruthSeeker.java @@ -27,19 +27,21 @@ */ package mage.cards.m; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author North @@ -48,7 +50,7 @@ public class MichikoKondaTruthSeeker extends CardImpl { public MichikoKondaTruthSeeker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java b/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java index 6a74796e968..8e418829249 100644 --- a/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java +++ b/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java @@ -41,6 +41,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -59,7 +60,7 @@ public class MikaeusTheLunarch extends CardImpl { public MikaeusTheLunarch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{X}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/m/MikaeusTheUnhallowed.java b/Mage.Sets/src/mage/cards/m/MikaeusTheUnhallowed.java index 4cf5af0f201..50b7374f7f8 100644 --- a/Mage.Sets/src/mage/cards/m/MikaeusTheUnhallowed.java +++ b/Mage.Sets/src/mage/cards/m/MikaeusTheUnhallowed.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -49,6 +49,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author North @@ -63,7 +65,7 @@ public class MikaeusTheUnhallowed extends CardImpl { public MikaeusTheUnhallowed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java b/Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java index 01121b84d6b..c3666b1cd80 100644 --- a/Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java +++ b/Mage.Sets/src/mage/cards/m/MikokoroCenterOfTheSea.java @@ -27,9 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,8 +35,12 @@ import mage.abilities.effects.common.DrawCardAllEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki @@ -48,7 +49,7 @@ public class MikokoroCenterOfTheSea extends CardImpl { public MikokoroCenterOfTheSea(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {2}, {tap}: Each player draws a card. diff --git a/Mage.Sets/src/mage/cards/m/MillenniumFalcon.java b/Mage.Sets/src/mage/cards/m/MillenniumFalcon.java index 39f75a049a7..80eb3a39c1f 100644 --- a/Mage.Sets/src/mage/cards/m/MillenniumFalcon.java +++ b/Mage.Sets/src/mage/cards/m/MillenniumFalcon.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -38,8 +37,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -48,7 +50,7 @@ public class MillenniumFalcon extends CardImpl { public MillenniumFalcon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Starship"); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java b/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java index 020f66adb1b..8fe96857ebc 100644 --- a/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java +++ b/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,11 +40,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -56,7 +58,7 @@ public class MinaAndDennWildborn extends CardImpl { public MinaAndDennWildborn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Ally"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MinamoSchoolAtWatersEdge.java b/Mage.Sets/src/mage/cards/m/MinamoSchoolAtWatersEdge.java index 84919250724..6d30060567d 100644 --- a/Mage.Sets/src/mage/cards/m/MinamoSchoolAtWatersEdge.java +++ b/Mage.Sets/src/mage/cards/m/MinamoSchoolAtWatersEdge.java @@ -40,6 +40,7 @@ import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.ColoredManaSymbol; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -54,13 +55,13 @@ public class MinamoSchoolAtWatersEdge extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("legendary permanent"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public MinamoSchoolAtWatersEdge (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.addAbility(new BlueManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/Mindslaver.java b/Mage.Sets/src/mage/cards/m/Mindslaver.java index 7c612043241..5fa739e9d38 100644 --- a/Mage.Sets/src/mage/cards/m/Mindslaver.java +++ b/Mage.Sets/src/mage/cards/m/Mindslaver.java @@ -27,9 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,9 +35,13 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.turn.ControlTargetPlayerNextTurnEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author nantuko @@ -49,7 +50,7 @@ public class Mindslaver extends CardImpl { public Mindslaver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {4}, {tap}, Sacrifice Mindslaver: You control target player during that player's next turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ControlTargetPlayerNextTurnEffect(), new GenericManaCost(4)); diff --git a/Mage.Sets/src/mage/cards/m/Mirari.java b/Mage.Sets/src/mage/cards/m/Mirari.java index f7919a43545..092c2f0cba5 100644 --- a/Mage.Sets/src/mage/cards/m/Mirari.java +++ b/Mage.Sets/src/mage/cards/m/Mirari.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; @@ -36,6 +35,7 @@ import mage.abilities.effects.common.DoIfCostPaid; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; @@ -47,6 +47,8 @@ import mage.game.stack.Spell; import mage.target.TargetSpell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +57,7 @@ public class Mirari extends CardImpl { public Mirari(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Whenever you cast an instant or sorcery spell, you may pay {3}. If you do, copy that spell. You may choose new targets for the copy. this.addAbility(new MirariTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java b/Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java index 1f784c9007f..37fec159f8f 100644 --- a/Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java +++ b/Mage.Sets/src/mage/cards/m/MirenTheMoaningWell.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -40,12 +39,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class MirenTheMoaningWell extends CardImpl { public MirenTheMoaningWell(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/m/MirkoVoskMindDrinker.java b/Mage.Sets/src/mage/cards/m/MirkoVoskMindDrinker.java index 1392852eb68..f81725f5311 100644 --- a/Mage.Sets/src/mage/cards/m/MirkoVoskMindDrinker.java +++ b/Mage.Sets/src/mage/cards/m/MirkoVoskMindDrinker.java @@ -28,24 +28,22 @@ package mage.cards.m; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +55,7 @@ public class MirkoVoskMindDrinker extends CardImpl { public MirkoVoskMindDrinker (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}"); this.subtype.add("Vampire"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/MirriCatWarrior.java b/Mage.Sets/src/mage/cards/m/MirriCatWarrior.java index 76ded6c9b47..678b52fd32e 100644 --- a/Mage.Sets/src/mage/cards/m/MirriCatWarrior.java +++ b/Mage.Sets/src/mage/cards/m/MirriCatWarrior.java @@ -27,14 +27,16 @@ */ package mage.cards.m; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.ForestwalkAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class MirriCatWarrior extends CardImpl { public MirriCatWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cat"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/m/MirriTheCursed.java b/Mage.Sets/src/mage/cards/m/MirriTheCursed.java index 986bd30481e..92daa95fd8a 100644 --- a/Mage.Sets/src/mage/cards/m/MirriTheCursed.java +++ b/Mage.Sets/src/mage/cards/m/MirriTheCursed.java @@ -27,19 +27,21 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToACreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author fireshoes @@ -48,7 +50,7 @@ public class MirriTheCursed extends CardImpl { public MirriTheCursed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Cat"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/m/MishraArtificerProdigy.java b/Mage.Sets/src/mage/cards/m/MishraArtificerProdigy.java index 42f9da0f830..be2467620a5 100644 --- a/Mage.Sets/src/mage/cards/m/MishraArtificerProdigy.java +++ b/Mage.Sets/src/mage/cards/m/MishraArtificerProdigy.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -37,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; @@ -49,6 +49,8 @@ import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author emerald000 @@ -57,7 +59,7 @@ public class MishraArtificerProdigy extends CardImpl { public MishraArtificerProdigy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MistformUltimus.java b/Mage.Sets/src/mage/cards/m/MistformUltimus.java index 6e14a3d0b82..586235f8bae 100644 --- a/Mage.Sets/src/mage/cards/m/MistformUltimus.java +++ b/Mage.Sets/src/mage/cards/m/MistformUltimus.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import java.util.UUID; @@ -44,7 +45,7 @@ public class MistformUltimus extends CardImpl { public MistformUltimus(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Illusion"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java b/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java index 3308d54e2a9..3c6b28f29ae 100644 --- a/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java +++ b/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -39,11 +38,7 @@ import mage.abilities.effects.common.counter.AddCountersControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterInstantOrSorceryCard; import mage.filter.common.FilterInstantOrSorcerySpell; @@ -53,6 +48,8 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author emerald000 @@ -67,7 +64,7 @@ public class MizzixOfTheIzmagnus extends CardImpl { public MizzixOfTheIzmagnus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Wizard"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java b/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java index 175418106f7..16aeef28fde 100644 --- a/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -44,16 +43,14 @@ import mage.abilities.effects.common.continuous.LoseCreatureTypeSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +59,7 @@ public class MogisGodOfSlaughter extends CardImpl { public MogisGodOfSlaughter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{2}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/m/MolimoMaroSorcerer.java b/Mage.Sets/src/mage/cards/m/MolimoMaroSorcerer.java index 5ed6c21819d..ba97b101bb5 100644 --- a/Mage.Sets/src/mage/cards/m/MolimoMaroSorcerer.java +++ b/Mage.Sets/src/mage/cards/m/MolimoMaroSorcerer.java @@ -27,10 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -38,9 +34,15 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; +import java.util.UUID; + /** * * @author Loki @@ -51,7 +53,7 @@ public class MolimoMaroSorcerer extends CardImpl { public MolimoMaroSorcerer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/m/MoltenRain.java b/Mage.Sets/src/mage/cards/m/MoltenRain.java index c7e7ae22bdd..bd2b09b2915 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenRain.java +++ b/Mage.Sets/src/mage/cards/m/MoltenRain.java @@ -87,7 +87,7 @@ class MoltenRainEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD); - if (permanent != null && !permanent.getSupertype().contains("Basic")) { + if (permanent != null && !permanent.isBasic()) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { player.damage(2, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/cards/m/MomirVigSimicVisionary.java b/Mage.Sets/src/mage/cards/m/MomirVigSimicVisionary.java index a3ade23f04d..52c6fdfd772 100644 --- a/Mage.Sets/src/mage/cards/m/MomirVigSimicVisionary.java +++ b/Mage.Sets/src/mage/cards/m/MomirVigSimicVisionary.java @@ -27,8 +27,6 @@ */ package mage.cards.m; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -37,13 +35,10 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterCreatureCard; @@ -53,6 +48,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.Set; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -72,7 +70,7 @@ public class MomirVigSimicVisionary extends CardImpl { public MomirVigSimicVisionary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/m/Morinfen.java b/Mage.Sets/src/mage/cards/m/Morinfen.java index 6b6b05f6e4b..7795113084d 100644 --- a/Mage.Sets/src/mage/cards/m/Morinfen.java +++ b/Mage.Sets/src/mage/cards/m/Morinfen.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.keyword.CumulativeUpkeepAbility; @@ -35,6 +34,9 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -44,7 +46,7 @@ public class Morinfen extends CardImpl { public Morinfen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Horror"); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MouthOfRonom.java b/Mage.Sets/src/mage/cards/m/MouthOfRonom.java index 3ac031790c5..077bd9ecad6 100644 --- a/Mage.Sets/src/mage/cards/m/MouthOfRonom.java +++ b/Mage.Sets/src/mage/cards/m/MouthOfRonom.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -38,9 +37,12 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Plopman @@ -49,7 +51,7 @@ public class MouthOfRonom extends CardImpl { public MouthOfRonom(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/m/MoxOpal.java b/Mage.Sets/src/mage/cards/m/MoxOpal.java index 467bd4e43f0..71c552b0010 100644 --- a/Mage.Sets/src/mage/cards/m/MoxOpal.java +++ b/Mage.Sets/src/mage/cards/m/MoxOpal.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.costs.common.TapSourceCost; @@ -37,8 +36,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com, Loki @@ -47,7 +49,7 @@ public class MoxOpal extends CardImpl { public MoxOpal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); Ability ability = new ActivateIfConditionManaAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/m/MultaniMaroSorcerer.java b/Mage.Sets/src/mage/cards/m/MultaniMaroSorcerer.java index 0eaa634ce2c..69cef00e959 100644 --- a/Mage.Sets/src/mage/cards/m/MultaniMaroSorcerer.java +++ b/Mage.Sets/src/mage/cards/m/MultaniMaroSorcerer.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInAllHandsCount; @@ -37,8 +36,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Plopman @@ -47,7 +49,7 @@ public class MultaniMaroSorcerer extends CardImpl { public MultaniMaroSorcerer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java index a35cabf2a1a..0a270230020 100644 --- a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java +++ b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -40,6 +39,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,6 +47,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +57,7 @@ public class MundaAmbushLeader extends CardImpl { public MundaAmbushLeader(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kor"); this.subtype.add("Ally"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java b/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java index 2524b9a5a59..c36d00b2ce7 100644 --- a/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java +++ b/Mage.Sets/src/mage/cards/m/MuzzioVisionaryArchitect.java @@ -27,21 +27,16 @@ */ package mage.cards.m; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.filter.common.FilterArtifactPermanent; @@ -50,6 +45,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetCard; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes @@ -58,7 +56,7 @@ public class MuzzioVisionaryArchitect extends CardImpl { public MuzzioVisionaryArchitect(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java index a7e449c3002..b5abe49962f 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java @@ -27,9 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -45,13 +42,17 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * @author Loki */ @@ -64,7 +65,7 @@ public class MyojinOfCleansingFire extends CardImpl { public MyojinOfCleansingFire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java b/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java index 650d9e9b0ed..efa4a18a097 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java @@ -27,9 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -45,12 +42,16 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * @author LevelX */ @@ -60,7 +61,7 @@ public class MyojinOfInfiniteRage extends CardImpl { public MyojinOfInfiniteRage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{7}{R}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java b/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java index 02868f33356..aec28e2016f 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java @@ -60,7 +60,7 @@ public class MyojinOfLifesWeb extends CardImpl { public MyojinOfLifesWeb(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java index 0efd43f914c..f7963e9dfa4 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java @@ -59,7 +59,7 @@ public class MyojinOfNightsReach extends CardImpl { public MyojinOfNightsReach(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java index e633c08f21d..7e1d239c02b 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java @@ -64,7 +64,7 @@ public class MyojinOfSeeingWinds extends CardImpl { public MyojinOfSeeingWinds(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{7}{U}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/m/MysticDecree.java b/Mage.Sets/src/mage/cards/m/MysticDecree.java index 83dd8b94da5..4a19dc93847 100644 --- a/Mage.Sets/src/mage/cards/m/MysticDecree.java +++ b/Mage.Sets/src/mage/cards/m/MysticDecree.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -49,7 +50,7 @@ public class MysticDecree extends CardImpl { public MysticDecree(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // All creatures lose flying and islandwalk. Effect effect = new LoseAbilityAllEffect(new FilterCreaturePermanent("All creatures"), FlyingAbility.getInstance(), Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/n/NagaoBoundByHonor.java b/Mage.Sets/src/mage/cards/n/NagaoBoundByHonor.java index 0fac6c1fd3a..b1583037d00 100644 --- a/Mage.Sets/src/mage/cards/n/NagaoBoundByHonor.java +++ b/Mage.Sets/src/mage/cards/n/NagaoBoundByHonor.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class NagaoBoundByHonor extends CardImpl { public NagaoBoundByHonor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/n/NarsetEnlightenedMaster.java b/Mage.Sets/src/mage/cards/n/NarsetEnlightenedMaster.java index 2b5a3e1b507..5435f7b8883 100644 --- a/Mage.Sets/src/mage/cards/n/NarsetEnlightenedMaster.java +++ b/Mage.Sets/src/mage/cards/n/NarsetEnlightenedMaster.java @@ -41,11 +41,7 @@ import mage.abilities.keyword.HexproofAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.target.targetpointer.FixedTarget; @@ -58,7 +54,7 @@ public class NarsetEnlightenedMaster extends CardImpl { public NarsetEnlightenedMaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Monk"); diff --git a/Mage.Sets/src/mage/cards/n/NathOfTheGiltLeaf.java b/Mage.Sets/src/mage/cards/n/NathOfTheGiltLeaf.java index 6bee3e7c4c0..33ee3e1a9da 100644 --- a/Mage.Sets/src/mage/cards/n/NathOfTheGiltLeaf.java +++ b/Mage.Sets/src/mage/cards/n/NathOfTheGiltLeaf.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.game.permanent.token.ElfToken; import mage.target.common.TargetOpponent; @@ -51,7 +52,7 @@ public class NathOfTheGiltLeaf extends CardImpl { public NathOfTheGiltLeaf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/n/NefaroxOverlordOfGrixis.java b/Mage.Sets/src/mage/cards/n/NefaroxOverlordOfGrixis.java index e7c416896ef..e328b031971 100644 --- a/Mage.Sets/src/mage/cards/n/NefaroxOverlordOfGrixis.java +++ b/Mage.Sets/src/mage/cards/n/NefaroxOverlordOfGrixis.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksAloneTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; @@ -36,8 +35,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -46,7 +48,7 @@ public class NefaroxOverlordOfGrixis extends CardImpl { public NefaroxOverlordOfGrixis(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/n/NekusarTheMindrazer.java b/Mage.Sets/src/mage/cards/n/NekusarTheMindrazer.java index ffa28080b11..b2d268635cd 100644 --- a/Mage.Sets/src/mage/cards/n/NekusarTheMindrazer.java +++ b/Mage.Sets/src/mage/cards/n/NekusarTheMindrazer.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.DrawCardOpponentTriggeredAbility; @@ -37,8 +36,11 @@ import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 @@ -47,7 +49,7 @@ public class NekusarTheMindrazer extends CardImpl { public NekusarTheMindrazer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java index 62bc6faee33..124cb07626e 100644 --- a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java +++ b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java @@ -27,9 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,7 +35,9 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -46,6 +45,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki @@ -61,7 +62,7 @@ public class NemataGroveGuardian extends CardImpl { public NemataGroveGuardian(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Treefolk"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/n/NetherVoid.java b/Mage.Sets/src/mage/cards/n/NetherVoid.java index 25c2a1a67d8..2e271a8043b 100644 --- a/Mage.Sets/src/mage/cards/n/NetherVoid.java +++ b/Mage.Sets/src/mage/cards/n/NetherVoid.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SetTargetPointer; +import mage.constants.SuperType; import mage.filter.FilterSpell; /** @@ -45,7 +46,7 @@ public class NetherVoid extends CardImpl { public NetherVoid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // Whenever a player casts a spell, counter it unless that player pays {3}. this.addAbility(new SpellCastAllTriggeredAbility(new CounterUnlessPaysEffect(new GenericManaCost(3)), new FilterSpell("a spell"), false, SetTargetPointer.SPELL)); diff --git a/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java b/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java index 6a8cc57a566..e905db2ec95 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java +++ b/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; @@ -51,6 +51,8 @@ import mage.target.Target; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCardInOpponentsGraveyard; +import java.util.UUID; + /** * @author Loki */ @@ -120,7 +122,7 @@ class NighteyesTheDesecratorToken extends Token { NighteyesTheDesecratorToken() { super("Nighteyes the Desecrator", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add("Rat"); diff --git a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java index 6f23cd95262..7b663c4ca6c 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java +++ b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java @@ -27,15 +27,9 @@ */ package mage.cards.n; -import java.util.UUID; - -import mage.abilities.CountType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; +import mage.abilities.CountType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; @@ -43,15 +37,18 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.FlipSourceEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * @author LevelX2 */ @@ -92,7 +89,7 @@ class StabwhiskerTheOdious extends Token { StabwhiskerTheOdious() { super("Stabwhisker the Odious", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add("Rat"); diff --git a/Mage.Sets/src/mage/cards/n/NicolBolas.java b/Mage.Sets/src/mage/cards/n/NicolBolas.java index 3ad55a640c6..b445e1cc609 100644 --- a/Mage.Sets/src/mage/cards/n/NicolBolas.java +++ b/Mage.Sets/src/mage/cards/n/NicolBolas.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; /** @@ -48,7 +49,7 @@ public class NicolBolas extends CardImpl { public NicolBolas(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}{B}{B}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); diff --git a/Mage.Sets/src/mage/cards/n/NightOfSoulsBetrayal.java b/Mage.Sets/src/mage/cards/n/NightOfSoulsBetrayal.java index 2c1ff28199a..a94a5a62273 100644 --- a/Mage.Sets/src/mage/cards/n/NightOfSoulsBetrayal.java +++ b/Mage.Sets/src/mage/cards/n/NightOfSoulsBetrayal.java @@ -28,17 +28,18 @@ package mage.cards.n; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -48,7 +49,7 @@ public class NightOfSoulsBetrayal extends CardImpl { public NightOfSoulsBetrayal (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/n/NinThePainArtist.java b/Mage.Sets/src/mage/cards/n/NinThePainArtist.java index 8ae64afb505..c40adb36c68 100644 --- a/Mage.Sets/src/mage/cards/n/NinThePainArtist.java +++ b/Mage.Sets/src/mage/cards/n/NinThePainArtist.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,12 +37,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 @@ -52,7 +54,7 @@ public class NinThePainArtist extends CardImpl { public NinThePainArtist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vedalken"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java index 11d0b19ddf6..cd16fdb1f98 100644 --- a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java +++ b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java @@ -40,12 +40,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -132,7 +127,7 @@ class NissaSageAnimistToken extends Token { NissaSageAnimistToken() { super("Ashaya, the Awoken World", "legendary 4/4 green Elemental creature token named Ashaya, the Awoken World"); this.setOriginalExpansionSetCode("ORI"); - this.getSupertype().add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.getPower().modifyBaseValue(4); this.getToughness().modifyBaseValue(4); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java b/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java index 644aab496bd..270e932e044 100644 --- a/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java +++ b/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.Gender; @@ -41,12 +40,15 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author emerald000 @@ -61,7 +63,7 @@ public class NissaVastwoodSeer extends CardImpl { public NissaVastwoodSeer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java b/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java index 507b0df9e45..3087e8d2689 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java @@ -27,9 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; @@ -40,8 +37,13 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 @@ -50,7 +52,7 @@ public class NivMizzetDracogenius extends CardImpl { public NivMizzetDracogenius(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java index c2a4ffc77f5..041e83d63d9 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java @@ -27,9 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DrawCardControllerTriggeredAbility; @@ -40,9 +37,13 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki @@ -51,7 +52,7 @@ public class NivMizzetTheFiremind extends CardImpl { public NivMizzetTheFiremind(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/n/NorinTheWary.java b/Mage.Sets/src/mage/cards/n/NorinTheWary.java index 85ae0869774..be2244663d8 100644 --- a/Mage.Sets/src/mage/cards/n/NorinTheWary.java +++ b/Mage.Sets/src/mage/cards/n/NorinTheWary.java @@ -27,18 +27,20 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.ExileReturnBattlefieldOwnerNextEndStepSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author LevelX2 @@ -47,7 +49,7 @@ public class NorinTheWary extends CardImpl { public NorinTheWary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java b/Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java index 00b915636f6..876d5989444 100644 --- a/Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java +++ b/Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -42,6 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledLandPermanent; @@ -53,6 +53,8 @@ import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes @@ -69,7 +71,7 @@ public class NoyanDarRoilShaper extends CardImpl { public NoyanDarRoilShaper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.subtype.add("Ally"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java b/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java index 5a94d9b0d1c..f8e74fb52bf 100644 --- a/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java +++ b/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -39,9 +38,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -50,7 +52,7 @@ public class NumotTheDevastator extends CardImpl { public NumotTheDevastator(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/n/NuteGunray.java b/Mage.Sets/src/mage/cards/n/NuteGunray.java index 28f05fd15c6..fe8898854cf 100644 --- a/Mage.Sets/src/mage/cards/n/NuteGunray.java +++ b/Mage.Sets/src/mage/cards/n/NuteGunray.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -41,6 +40,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterControlledArtifactPermanent; @@ -49,6 +49,8 @@ import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.DroidToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Styxo @@ -63,7 +65,7 @@ public class NuteGunray extends CardImpl { public NuteGunray(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Neimidian"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/n/NykthosShrineToNyx.java b/Mage.Sets/src/mage/cards/n/NykthosShrineToNyx.java index 98b71829194..1b0126f06e0 100644 --- a/Mage.Sets/src/mage/cards/n/NykthosShrineToNyx.java +++ b/Mage.Sets/src/mage/cards/n/NykthosShrineToNyx.java @@ -27,25 +27,27 @@ */ package mage.cards.n; -import java.util.List; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.DevotionCount; import mage.abilities.effects.common.ManaEffect; -import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.ActivatedManaAbilityImpl; +import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class NykthosShrineToNyx extends CardImpl { public NykthosShrineToNyx(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/n/NyleaGodOfTheHunt.java b/Mage.Sets/src/mage/cards/n/NyleaGodOfTheHunt.java index cd8a07bfc32..8db5c245402 100644 --- a/Mage.Sets/src/mage/cards/n/NyleaGodOfTheHunt.java +++ b/Mage.Sets/src/mage/cards/n/NyleaGodOfTheHunt.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,13 +41,12 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +55,7 @@ public class NyleaGodOfTheHunt extends CardImpl { public NyleaGodOfTheHunt(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/o/OathOfAjani.java b/Mage.Sets/src/mage/cards/o/OathOfAjani.java index 096a6b1a0cb..e5fa9494738 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfAjani.java +++ b/Mage.Sets/src/mage/cards/o/OathOfAjani.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -49,7 +50,7 @@ public class OathOfAjani extends CardImpl { public OathOfAjani(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // When Oath of Ajani enters the battlefield, put a +1/+1 counter on each creature you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent()))); diff --git a/Mage.Sets/src/mage/cards/o/OathOfChandra.java b/Mage.Sets/src/mage/cards/o/OathOfChandra.java index 1d9a1105deb..cebc05133a2 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfChandra.java +++ b/Mage.Sets/src/mage/cards/o/OathOfChandra.java @@ -27,9 +27,6 @@ */ package mage.cards.o; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,11 +37,7 @@ import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -53,6 +46,10 @@ import mage.game.events.ZoneChangeEvent; import mage.target.common.TargetCreaturePermanent; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -67,7 +64,7 @@ public class OathOfChandra extends CardImpl { public OathOfChandra(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // When Oath of Chandra enters the battlefield, it deals 3 damage to target creature an opponent controls. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3), false); diff --git a/Mage.Sets/src/mage/cards/o/OathOfGideon.java b/Mage.Sets/src/mage/cards/o/OathOfGideon.java index a427024e578..8967fbfd158 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfGideon.java +++ b/Mage.Sets/src/mage/cards/o/OathOfGideon.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -35,10 +34,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; @@ -46,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.permanent.token.KorAllyToken; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +52,7 @@ public class OathOfGideon extends CardImpl { public OathOfGideon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // When Oath of Gideon enters the battlefield, create two 1/1 Kor Ally creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KorAllyToken(), 2), false)); diff --git a/Mage.Sets/src/mage/cards/o/OathOfJace.java b/Mage.Sets/src/mage/cards/o/OathOfJace.java index 96ea501cae8..343895aa4aa 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfJace.java +++ b/Mage.Sets/src/mage/cards/o/OathOfJace.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,11 +36,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterPlaneswalkerPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -50,7 +52,7 @@ public class OathOfJace extends CardImpl { public OathOfJace(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // When Oath of Jace enters the battlefield, draw three cards, then discard two cards. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawDiscardControllerEffect(3, 2), false)); diff --git a/Mage.Sets/src/mage/cards/o/OathOfLiliana.java b/Mage.Sets/src/mage/cards/o/OathOfLiliana.java index b3c4969f1b7..8b300454fa9 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLiliana.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLiliana.java @@ -27,9 +27,6 @@ */ package mage.cards.o; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -39,10 +36,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.SacrificeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.TargetController; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -50,6 +44,10 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.token.ZombieToken; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author fireshoes @@ -58,7 +56,7 @@ public class OathOfLiliana extends CardImpl { public OathOfLiliana(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // When Oath of Liliana enters the battlefield, each opponent sacrifices a creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeOpponentsEffect(new FilterControlledCreaturePermanent("a creature")), false)); diff --git a/Mage.Sets/src/mage/cards/o/OathOfNissa.java b/Mage.Sets/src/mage/cards/o/OathOfNissa.java index 285da1163be..c4e93abb267 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfNissa.java +++ b/Mage.Sets/src/mage/cards/o/OathOfNissa.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -35,17 +34,8 @@ import mage.abilities.common.SimpleStaticAbility; 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.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.ManaType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -54,6 +44,8 @@ import mage.players.ManaPoolItem; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 @@ -62,7 +54,7 @@ public class OathOfNissa extends CardImpl { public OathOfNissa(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // When Oath of Nissa enters the battlefield, look at the top three cards of your library. You may reveal a creature, land, or planeswalker card from among them and put it into your hand. Put the rest on the bottom of your library in any order. this.addAbility(new EntersBattlefieldTriggeredAbility(new OathOfNissaEffect())); diff --git a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java index e9aadaefd5a..b5cb61ddb0c 100644 --- a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java +++ b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java @@ -42,10 +42,7 @@ 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.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -64,7 +61,7 @@ public class OathkeeperTakenosDaisho extends CardImpl { public OathkeeperTakenosDaisho(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature gets +3/+1. diff --git a/Mage.Sets/src/mage/cards/o/ObNixilisTheFallen.java b/Mage.Sets/src/mage/cards/o/ObNixilisTheFallen.java index 1993f06c40f..3ba20355b77 100644 --- a/Mage.Sets/src/mage/cards/o/ObNixilisTheFallen.java +++ b/Mage.Sets/src/mage/cards/o/ObNixilisTheFallen.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -36,9 +35,12 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki @@ -47,7 +49,7 @@ public class ObNixilisTheFallen extends CardImpl { public ObNixilisTheFallen(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/o/ObNixilisUnshackled.java b/Mage.Sets/src/mage/cards/o/ObNixilisUnshackled.java index 29c1344144e..a9f444204d6 100644 --- a/Mage.Sets/src/mage/cards/o/ObNixilisUnshackled.java +++ b/Mage.Sets/src/mage/cards/o/ObNixilisUnshackled.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -39,6 +38,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; @@ -49,6 +49,8 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 @@ -57,7 +59,7 @@ public class ObNixilisUnshackled extends CardImpl { public ObNixilisUnshackled(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java b/Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java index dc69a42180d..94fa4c632d1 100644 --- a/Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java +++ b/Mage.Sets/src/mage/cards/o/OboroPalaceInTheClouds.java @@ -27,17 +27,18 @@ */ package mage.cards.o; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Loki @@ -46,7 +47,7 @@ public class OboroPalaceInTheClouds extends CardImpl { public OboroPalaceInTheClouds(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {U} to your mana pool. this.addAbility(new BlueManaAbility()); // {1}: Return Oboro, Palace in the Clouds to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java b/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java index cc9189ba600..bdbd1d85f9b 100644 --- a/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java +++ b/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java @@ -28,7 +28,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -44,11 +43,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -56,6 +51,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Plopman @@ -66,7 +63,7 @@ public class ObzedatGhostCouncil extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}{B}{B}"); this.subtype.add("Spirit"); this.subtype.add("Advisor"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/o/OdricLunarchMarshal.java b/Mage.Sets/src/mage/cards/o/OdricLunarchMarshal.java index 00edf9e6a9f..565593208ed 100644 --- a/Mage.Sets/src/mage/cards/o/OdricLunarchMarshal.java +++ b/Mage.Sets/src/mage/cards/o/OdricLunarchMarshal.java @@ -27,35 +27,21 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; -import mage.abilities.keyword.DeathtouchAbility; -import mage.abilities.keyword.DoubleStrikeAbility; -import mage.abilities.keyword.FirstStrikeAbility; -import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.HasteAbility; -import mage.abilities.keyword.HexproofAbility; -import mage.abilities.keyword.IndestructibleAbility; -import mage.abilities.keyword.LifelinkAbility; -import mage.abilities.keyword.MenaceAbility; -import mage.abilities.keyword.ReachAbility; -import mage.abilities.keyword.SkulkAbility; -import mage.abilities.keyword.TrampleAbility; -import mage.abilities.keyword.VigilanceAbility; +import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) @@ -64,7 +50,7 @@ public class OdricLunarchMarshal extends CardImpl { public OdricLunarchMarshal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/o/OdricMasterTactician.java b/Mage.Sets/src/mage/cards/o/OdricMasterTactician.java index eaf5a41f107..f1e79dc62ce 100644 --- a/Mage.Sets/src/mage/cards/o/OdricMasterTactician.java +++ b/Mage.Sets/src/mage/cards/o/OdricMasterTactician.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -35,15 +34,14 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.UUID; + /** * @author noxx */ @@ -51,7 +49,7 @@ public class OdricMasterTactician extends CardImpl { public OdricMasterTactician(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/o/OhranViper.java b/Mage.Sets/src/mage/cards/o/OhranViper.java index b5dd4237a45..a1b1044d8b0 100644 --- a/Mage.Sets/src/mage/cards/o/OhranViper.java +++ b/Mage.Sets/src/mage/cards/o/OhranViper.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -38,6 +37,9 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -47,7 +49,7 @@ public class OhranViper extends CardImpl { public OhranViper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Snake"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/o/OhranYeti.java b/Mage.Sets/src/mage/cards/o/OhranYeti.java index f4e9efab9b6..d1d9f79b667 100644 --- a/Mage.Sets/src/mage/cards/o/OhranYeti.java +++ b/Mage.Sets/src/mage/cards/o/OhranYeti.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,11 +37,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -57,7 +59,7 @@ public class OhranYeti extends CardImpl { public OhranYeti(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Yeti"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java b/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java index 2176967a2b4..00fb9514297 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAllTriggeredAbility; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SetTargetPointer; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -47,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +66,7 @@ public class OjutaiSoulOfWinter extends CardImpl { public OjutaiSoulOfWinter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java b/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java index 323356be8fd..d62a77c09a4 100644 --- a/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java +++ b/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java @@ -56,7 +56,7 @@ public class OkinaTempleToTheGrandfathers extends CardImpl { public OkinaTempleToTheGrandfathers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.addAbility(new GreenManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/o/OliviaMobilizedForWar.java b/Mage.Sets/src/mage/cards/o/OliviaMobilizedForWar.java index 4474e658734..2f9ff781c72 100644 --- a/Mage.Sets/src/mage/cards/o/OliviaMobilizedForWar.java +++ b/Mage.Sets/src/mage/cards/o/OliviaMobilizedForWar.java @@ -39,10 +39,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -66,7 +63,7 @@ public class OliviaMobilizedForWar extends CardImpl { public OliviaMobilizedForWar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.subtype.add("Knight"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java index 612804d293b..d5f26f8e040 100644 --- a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java @@ -68,7 +68,7 @@ public class OliviaVoldaren extends CardImpl { public OliviaVoldaren(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/o/OloroAgelessAscetic.java b/Mage.Sets/src/mage/cards/o/OloroAgelessAscetic.java index 9a1f96c2cf6..bd3d56e4419 100644 --- a/Mage.Sets/src/mage/cards/o/OloroAgelessAscetic.java +++ b/Mage.Sets/src/mage/cards/o/OloroAgelessAscetic.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.GainLifeControllerTriggeredAbility; @@ -41,9 +40,12 @@ import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +54,7 @@ public class OloroAgelessAscetic extends CardImpl { public OloroAgelessAscetic(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Giant"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfMana.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfMana.java index 8fa416486af..ef6bcd5f3f6 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfMana.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfMana.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -37,16 +36,12 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.ManaType; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +50,7 @@ public class OmnathLocusOfMana extends CardImpl { public OmnathLocusOfMana(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java index cc8506120d4..1140cc4062f 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesThisOrAnotherCreatureTriggeredAbility; @@ -37,6 +36,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -44,6 +44,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.Token; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author fireshoes @@ -59,7 +61,7 @@ public class OmnathLocusOfRage extends CardImpl { public OmnathLocusOfRage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java index 8247fb6f97b..349bb6c16ad 100644 --- a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java +++ b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java @@ -41,6 +41,7 @@ import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.token.Token; @@ -55,7 +56,7 @@ public class OonaQueenOfTheFae extends CardImpl { public OonaQueenOfTheFae(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U/B}{U/B}{U/B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Faerie"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java b/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java index 4f2ae6ad1ac..1174d5a1e92 100644 --- a/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java +++ b/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java @@ -27,11 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -44,7 +39,7 @@ import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.Duration; +import mage.constants.*; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -52,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetSource; +import java.util.UUID; + /** * @author LevelX2 */ @@ -59,7 +56,7 @@ public class OpalEyeKondasYojimbo extends CardImpl { public OpalEyeKondasYojimbo(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Fox"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java b/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java index 6f45f944176..ad966f8507e 100644 --- a/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java +++ b/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java @@ -27,9 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +34,14 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +50,7 @@ public class OrimSamiteHealer extends CardImpl { public OrimSamiteHealer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java b/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java index d131f060ddc..4bd7ed4d90c 100644 --- a/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java +++ b/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.abilityword.GrandeurAbility; @@ -40,10 +39,7 @@ import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -53,6 +49,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 @@ -61,7 +59,7 @@ public class OrissSamiteGuardian extends CardImpl { public OrissSamiteGuardian(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/cards/o/OrmendahlProfanePrince.java b/Mage.Sets/src/mage/cards/o/OrmendahlProfanePrince.java index eabccad3d2e..bf14001bfcf 100644 --- a/Mage.Sets/src/mage/cards/o/OrmendahlProfanePrince.java +++ b/Mage.Sets/src/mage/cards/o/OrmendahlProfanePrince.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; @@ -36,6 +35,9 @@ import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -45,7 +47,7 @@ public class OrmendahlProfanePrince extends CardImpl { public OrmendahlProfanePrince(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(9); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java index 27de06e32f1..077c040ee32 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java +++ b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java @@ -33,6 +33,7 @@ package mage.cards.o; import mage.abilities.CountType; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; @@ -93,7 +94,7 @@ class ShidakoBroodmistress extends Token { ShidakoBroodmistress() { super("Shidako, Broodmistress", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Snake"); diff --git a/Mage.Sets/src/mage/cards/o/OrosTheAvenger.java b/Mage.Sets/src/mage/cards/o/OrosTheAvenger.java index 1fcd295ecce..eb7814324f8 100644 --- a/Mage.Sets/src/mage/cards/o/OrosTheAvenger.java +++ b/Mage.Sets/src/mage/cards/o/OrosTheAvenger.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -38,10 +37,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +58,7 @@ public class OrosTheAvenger extends CardImpl { public OrosTheAvenger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java b/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java index 15bfd625e7a..4fd1551bf5d 100644 --- a/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java +++ b/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; @@ -48,6 +48,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.util.RandomUtil; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +58,7 @@ public class OviyaPashiriSageLifecrafter extends CardImpl { public OviyaPashiriSageLifecrafter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/o/OyobiWhoSplitTheHeavens.java b/Mage.Sets/src/mage/cards/o/OyobiWhoSplitTheHeavens.java index 22d0d5e2cd9..3da63d175b9 100644 --- a/Mage.Sets/src/mage/cards/o/OyobiWhoSplitTheHeavens.java +++ b/Mage.Sets/src/mage/cards/o/OyobiWhoSplitTheHeavens.java @@ -27,18 +27,19 @@ */ package mage.cards.o; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author Loki */ @@ -48,7 +49,7 @@ public class OyobiWhoSplitTheHeavens extends CardImpl { public OyobiWhoSplitTheHeavens(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/p/PadeemConsulOfInnovation.java b/Mage.Sets/src/mage/cards/p/PadeemConsulOfInnovation.java index a91e0671a3a..3a35743d2df 100644 --- a/Mage.Sets/src/mage/cards/p/PadeemConsulOfInnovation.java +++ b/Mage.Sets/src/mage/cards/p/PadeemConsulOfInnovation.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,12 +38,11 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +51,7 @@ public class PadeemConsulOfInnovation extends CardImpl { public PadeemConsulOfInnovation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vedalken"); this.subtype.add("Artificer"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/p/PalladiaMors.java b/Mage.Sets/src/mage/cards/p/PalladiaMors.java index 51c0eaf0df5..60d384d6a51 100644 --- a/Mage.Sets/src/mage/cards/p/PalladiaMors.java +++ b/Mage.Sets/src/mage/cards/p/PalladiaMors.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +36,11 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LoneFox @@ -47,7 +49,7 @@ public class PalladiaMors extends CardImpl { public PalladiaMors(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{G}{G}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/p/PangTongYoungPhoenix.java b/Mage.Sets/src/mage/cards/p/PangTongYoungPhoenix.java index e514f08c0eb..37593148fbf 100644 --- a/Mage.Sets/src/mage/cards/p/PangTongYoungPhoenix.java +++ b/Mage.Sets/src/mage/cards/p/PangTongYoungPhoenix.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -38,9 +37,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -49,7 +51,7 @@ public class PangTongYoungPhoenix extends CardImpl { public PangTongYoungPhoenix(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/p/ParadoxEngine.java b/Mage.Sets/src/mage/cards/p/ParadoxEngine.java index 617624391a9..45cc18a2185 100644 --- a/Mage.Sets/src/mage/cards/p/ParadoxEngine.java +++ b/Mage.Sets/src/mage/cards/p/ParadoxEngine.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.UntapAllControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterNonlandPermanent; /** @@ -44,7 +45,7 @@ public class ParadoxEngine extends CardImpl { public ParadoxEngine(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); // Whenever you cast a spell, untap all nonland permanents you control. this.addAbility(new SpellCastControllerTriggeredAbility(new UntapAllControllerEffect(new FilterNonlandPermanent()), false)); diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheAkki.java b/Mage.Sets/src/mage/cards/p/PatronOfTheAkki.java index d85e0fff069..525626de844 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheAkki.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheAkki.java @@ -27,18 +27,19 @@ */ package mage.cards.p; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.OfferingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * @author LevelX2 @@ -47,7 +48,7 @@ public class PatronOfTheAkki extends CardImpl { public PatronOfTheAkki(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheKitsune.java b/Mage.Sets/src/mage/cards/p/PatronOfTheKitsune.java index 7a3559bc6e0..90e96cb743d 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheKitsune.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheKitsune.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -35,6 +34,9 @@ import mage.abilities.keyword.OfferingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @author LevelX2 @@ -43,7 +45,7 @@ public class PatronOfTheKitsune extends CardImpl { public PatronOfTheKitsune(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java b/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java index c1fff9c4f00..6d71a2ab22a 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java @@ -40,6 +40,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.game.Game; @@ -54,7 +55,7 @@ public class PatronOfTheMoon extends CardImpl { public PatronOfTheMoon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheNezumi.java b/Mage.Sets/src/mage/cards/p/PatronOfTheNezumi.java index 5c3bde46de3..6277f53d486 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheNezumi.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheNezumi.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -37,6 +36,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -44,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author LevelX2 @@ -52,7 +54,7 @@ public class PatronOfTheNezumi extends CardImpl { public PatronOfTheNezumi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheOrochi.java b/Mage.Sets/src/mage/cards/p/PatronOfTheOrochi.java index 5eb41d16c6b..f0491230c28 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheOrochi.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheOrochi.java @@ -27,19 +27,18 @@ */ package mage.cards.p; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; +import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; -import mage.abilities.effects.OneShotEffect; -import mage.ObjectColor; import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.OfferingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -50,6 +49,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * @author LevelX2 @@ -58,7 +59,7 @@ public class PatronOfTheOrochi extends CardImpl { public PatronOfTheOrochi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/p/PavelMaliki.java b/Mage.Sets/src/mage/cards/p/PavelMaliki.java index 4785b7f4daf..afa4f7e5c30 100644 --- a/Mage.Sets/src/mage/cards/p/PavelMaliki.java +++ b/Mage.Sets/src/mage/cards/p/PavelMaliki.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,8 +35,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author nigelzor @@ -46,7 +48,7 @@ public class PavelMaliki extends CardImpl { public PavelMaliki(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/p/Pendelhaven.java b/Mage.Sets/src/mage/cards/p/Pendelhaven.java index cc060ca7d72..b93be6d2224 100644 --- a/Mage.Sets/src/mage/cards/p/Pendelhaven.java +++ b/Mage.Sets/src/mage/cards/p/Pendelhaven.java @@ -27,9 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,7 +34,9 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -59,7 +60,7 @@ public class Pendelhaven extends CardImpl { public Pendelhaven(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {G} to your mana pool. this.addAbility(new GreenManaAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PhageTheUntouchable.java b/Mage.Sets/src/mage/cards/p/PhageTheUntouchable.java index 643d1aac163..d90a45b9359 100644 --- a/Mage.Sets/src/mage/cards/p/PhageTheUntouchable.java +++ b/Mage.Sets/src/mage/cards/p/PhageTheUntouchable.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,8 +40,11 @@ import mage.abilities.effects.common.LoseGameTargetPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.watchers.common.CastFromHandWatcher; +import java.util.UUID; + /** * * @author LevelX2 @@ -51,7 +53,7 @@ public class PhageTheUntouchable extends CardImpl { public PhageTheUntouchable(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Avatar"); this.subtype.add("Minion"); diff --git a/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java b/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java index ff440b907d2..39d4c1ed029 100644 --- a/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java +++ b/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,10 +41,7 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.token.Token; @@ -53,6 +49,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -61,7 +59,7 @@ public class PharikaGodOfAffliction extends CardImpl { public PharikaGodOfAffliction(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{1}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/p/Phelddagrif.java b/Mage.Sets/src/mage/cards/p/Phelddagrif.java index acf12cd11d6..6bbec7e8433 100644 --- a/Mage.Sets/src/mage/cards/p/Phelddagrif.java +++ b/Mage.Sets/src/mage/cards/p/Phelddagrif.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,10 +42,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.permanent.token.HippoToken; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +57,7 @@ public class Phelddagrif extends CardImpl { public Phelddagrif(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Phelddagrif"); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/p/PhenaxGodOfDeception.java b/Mage.Sets/src/mage/cards/p/PhenaxGodOfDeception.java index 784b04461f9..e1fd97467ec 100644 --- a/Mage.Sets/src/mage/cards/p/PhenaxGodOfDeception.java +++ b/Mage.Sets/src/mage/cards/p/PhenaxGodOfDeception.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,13 +41,12 @@ import mage.abilities.effects.common.continuous.LoseCreatureTypeSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +55,7 @@ public class PhenaxGodOfDeception extends CardImpl { public PhenaxGodOfDeception(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java index 2afd2422b65..0369d92495b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; /** @@ -47,7 +48,7 @@ public class PhyrexianIronfoot extends CardImpl { public PhyrexianIronfoot(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); - this.supertype.add("Snow"); + this.addSuperType(SuperType.SNOW); this.subtype.add("Construct"); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java b/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java index 2a78763fe8e..7a40fe14146 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -37,8 +36,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox @@ -47,7 +49,7 @@ public class PhyrexianSnowcrusher extends CardImpl { public PhyrexianSnowcrusher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{6}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Juggernaut"); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianSoulgorger.java b/Mage.Sets/src/mage/cards/p/PhyrexianSoulgorger.java index 3de5658e05a..eca4081e45b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianSoulgorger.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianSoulgorger.java @@ -27,16 +27,18 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 @@ -45,7 +47,7 @@ public class PhyrexianSoulgorger extends CardImpl { public PhyrexianSoulgorger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Construct"); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianTower.java b/Mage.Sets/src/mage/cards/p/PhyrexianTower.java index 44d25b3f162..007315b4509 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianTower.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianTower.java @@ -27,9 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,8 +35,13 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -48,7 +50,7 @@ public class PhyrexianTower extends CardImpl { public PhyrexianTower(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java index d1a794487f9..e018680353a 100644 --- a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java +++ b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,12 +39,15 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.game.permanent.token.ThopterColorlessToken; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class PiaAndKiranNalaar extends CardImpl { public PiaAndKiranNalaar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/p/PiaNalaar.java b/Mage.Sets/src/mage/cards/p/PiaNalaar.java index 2f2096d6cd2..1e22ac31988 100644 --- a/Mage.Sets/src/mage/cards/p/PiaNalaar.java +++ b/Mage.Sets/src/mage/cards/p/PiaNalaar.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledArtifactPermanent; @@ -57,7 +58,7 @@ public class PiaNalaar extends CardImpl { public PiaNalaar(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/p/PiannaNomadCaptain.java b/Mage.Sets/src/mage/cards/p/PiannaNomadCaptain.java index b606f188a5a..51ea1cd9bff 100644 --- a/Mage.Sets/src/mage/cards/p/PiannaNomadCaptain.java +++ b/Mage.Sets/src/mage/cards/p/PiannaNomadCaptain.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -35,9 +34,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; +import java.util.UUID; + /** * * @author cbt33 @@ -52,7 +54,7 @@ public class PiannaNomadCaptain extends CardImpl { public PiannaNomadCaptain(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Nomad"); diff --git a/Mage.Sets/src/mage/cards/p/PilgrimsEye.java b/Mage.Sets/src/mage/cards/p/PilgrimsEye.java index 1e79d6ca854..690971b1b8e 100644 --- a/Mage.Sets/src/mage/cards/p/PilgrimsEye.java +++ b/Mage.Sets/src/mage/cards/p/PilgrimsEye.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterBasicLandCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -50,7 +51,7 @@ public class PilgrimsEye extends CardImpl { private static final FilterCard filter = new FilterCard("basic land card"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(new CardTypePredicate(CardType.LAND)); } diff --git a/Mage.Sets/src/mage/cards/p/PlanarBridge.java b/Mage.Sets/src/mage/cards/p/PlanarBridge.java index f50d69d6ab1..20f31287f3b 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarBridge.java +++ b/Mage.Sets/src/mage/cards/p/PlanarBridge.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -36,10 +35,13 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author anonymous @@ -49,7 +51,7 @@ public class PlanarBridge extends CardImpl { public PlanarBridge(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {8}, {T}: Search your library for a permanent card, put it onto the battlefield, then shuffle your library. Ability ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/p/PloKoon.java b/Mage.Sets/src/mage/cards/p/PloKoon.java index 6c62ed38e3c..51bbac7b2eb 100644 --- a/Mage.Sets/src/mage/cards/p/PloKoon.java +++ b/Mage.Sets/src/mage/cards/p/PloKoon.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,8 +35,11 @@ import mage.abilities.keyword.MeditateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author Styxo @@ -46,7 +48,7 @@ public class PloKoon extends CardImpl { public PloKoon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("KelDor"); this.subtype.add("Jedi"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/p/PolukranosWorldEater.java b/Mage.Sets/src/mage/cards/p/PolukranosWorldEater.java index 420a70e7484..56903d49de8 100644 --- a/Mage.Sets/src/mage/cards/p/PolukranosWorldEater.java +++ b/Mage.Sets/src/mage/cards/p/PolukranosWorldEater.java @@ -27,9 +27,6 @@ */ package mage.cards.p; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility; @@ -39,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -47,6 +45,10 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.common.TargetCreaturePermanentAmount; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * * The value of X in Polukranos’s last ability is equal to the value chosen @@ -77,7 +79,7 @@ public class PolukranosWorldEater extends CardImpl { public PolukranosWorldEater(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Hydra"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/p/PredatorFlagship.java b/Mage.Sets/src/mage/cards/p/PredatorFlagship.java index 16b93bf914e..812573d8bb4 100644 --- a/Mage.Sets/src/mage/cards/p/PredatorFlagship.java +++ b/Mage.Sets/src/mage/cards/p/PredatorFlagship.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,11 +38,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +60,7 @@ public class PredatorFlagship extends CardImpl { public PredatorFlagship(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {2}: Target creature gains flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}")); diff --git a/Mage.Sets/src/mage/cards/p/PrimeSpeakerZegana.java b/Mage.Sets/src/mage/cards/p/PrimeSpeakerZegana.java index 35b2c2909bd..c27d116b079 100644 --- a/Mage.Sets/src/mage/cards/p/PrimeSpeakerZegana.java +++ b/Mage.Sets/src/mage/cards/p/PrimeSpeakerZegana.java @@ -28,7 +28,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,11 +40,14 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Plopman @@ -56,7 +58,7 @@ public class PrimeSpeakerZegana extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}{U}{U}"); this.subtype.add("Merfolk"); this.subtype.add("Wizard"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/p/PrincessLeia.java b/Mage.Sets/src/mage/cards/p/PrincessLeia.java index 35b166f58eb..d4c90d507b5 100644 --- a/Mage.Sets/src/mage/cards/p/PrincessLeia.java +++ b/Mage.Sets/src/mage/cards/p/PrincessLeia.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; @@ -47,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Styxo @@ -65,7 +67,7 @@ public class PrincessLeia extends CardImpl { public PrincessLeia(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{U}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rebel"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/p/PrincessLucrezia.java b/Mage.Sets/src/mage/cards/p/PrincessLucrezia.java index 7d78d15f629..dc3a33d3eac 100644 --- a/Mage.Sets/src/mage/cards/p/PrincessLucrezia.java +++ b/Mage.Sets/src/mage/cards/p/PrincessLucrezia.java @@ -27,12 +27,14 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; +import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.abilities.mana.BlueManaAbility; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class PrincessLucrezia extends CardImpl { public PrincessLucrezia(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/p/Progenitus.java b/Mage.Sets/src/mage/cards/p/Progenitus.java index 6f11e57ebf3..72223783e5a 100644 --- a/Mage.Sets/src/mage/cards/p/Progenitus.java +++ b/Mage.Sets/src/mage/cards/p/Progenitus.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.common.PutIntoGraveFromAnywhereSourceAbility; @@ -36,9 +35,12 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.game.Game; +import java.util.UUID; + /** * * @author North @@ -47,7 +49,7 @@ public class Progenitus extends CardImpl { public Progenitus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}{U}{U}{B}{B}{R}{R}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Hydra"); this.subtype.add("Avatar"); diff --git a/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java b/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java index 0fcf5e5e2ec..9bc83aab480 100644 --- a/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java +++ b/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -40,12 +39,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +62,7 @@ public class ProsshSkyraiderOfKher extends CardImpl { public ProsshSkyraiderOfKher(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java b/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java index 65899b13dca..2ffb85c87d8 100644 --- a/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java +++ b/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java @@ -41,11 +41,7 @@ import mage.abilities.effects.common.continuous.LoseCreatureTypeSourceEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -62,7 +58,8 @@ public class PurphorosGodOfTheForge extends CardImpl { public PurphorosGodOfTheForge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{R}"); - this.supertype.add("Legendary"); + + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/p/PyromancersGoggles.java b/Mage.Sets/src/mage/cards/p/PyromancersGoggles.java index 76b4680f61a..c6920782835 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersGoggles.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersGoggles.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -37,6 +36,7 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterInstantOrSorcerySpell; import mage.filter.predicate.mageobject.ColorPredicate; @@ -46,6 +46,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class PyromancersGoggles extends CardImpl { public PyromancersGoggles(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {T}: Add {R} to your mana pool. Ability ability = new RedManaAbility(); diff --git a/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java b/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java index efddbff2b88..953e72c53d6 100644 --- a/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java +++ b/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java @@ -166,7 +166,7 @@ class PyxisOfPandemoniumPutOntoBattlefieldEffect extends OneShotEffect { if (exileZone != null) { for (Card card : exileZone.getCards(game)) { card.setFaceDown(false, game); - if (CardUtil.isPermanentCard(card)) { + if (card.isPermanent()) { cardsToBringIntoPlay.add(card); } } diff --git a/Mage.Sets/src/mage/cards/q/QueenMarchesa.java b/Mage.Sets/src/mage/cards/q/QueenMarchesa.java index 85dc944ae2c..c5a2744a691 100644 --- a/Mage.Sets/src/mage/cards/q/QueenMarchesa.java +++ b/Mage.Sets/src/mage/cards/q/QueenMarchesa.java @@ -27,7 +27,6 @@ */ package mage.cards.q; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,10 +40,13 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class QueenMarchesa extends CardImpl { public QueenMarchesa(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Assassin"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/q/QuiGonJinn.java b/Mage.Sets/src/mage/cards/q/QuiGonJinn.java index d6305fa9c71..a33ebdd39e2 100644 --- a/Mage.Sets/src/mage/cards/q/QuiGonJinn.java +++ b/Mage.Sets/src/mage/cards/q/QuiGonJinn.java @@ -27,12 +27,10 @@ */ package mage.cards.q; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAloneTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; -import mage.abilities.keyword.VigilanceAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetEffect; @@ -40,12 +38,16 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.MeditateAbility; +import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author Styxo @@ -54,7 +56,7 @@ public class QuiGonJinn extends CardImpl { public QuiGonJinn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Jedi"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/r/RadhaHeirToKeld.java b/Mage.Sets/src/mage/cards/r/RadhaHeirToKeld.java index 420a8432004..af2730dd581 100644 --- a/Mage.Sets/src/mage/cards/r/RadhaHeirToKeld.java +++ b/Mage.Sets/src/mage/cards/r/RadhaHeirToKeld.java @@ -37,6 +37,7 @@ import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -46,7 +47,7 @@ public class RadhaHeirToKeld extends CardImpl { public RadhaHeirToKeld(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{G}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/r/RadiantArchangel.java b/Mage.Sets/src/mage/cards/r/RadiantArchangel.java index ab428cf41bc..93f620c27ac 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RadiantArchangel.java @@ -27,10 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -40,10 +36,16 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author Plopman @@ -60,7 +62,7 @@ public class RadiantArchangel extends CardImpl { public RadiantArchangel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/RafiqOfTheMany.java b/Mage.Sets/src/mage/cards/r/RafiqOfTheMany.java index 13f1ce0de43..4cdb52c0403 100644 --- a/Mage.Sets/src/mage/cards/r/RafiqOfTheMany.java +++ b/Mage.Sets/src/mage/cards/r/RafiqOfTheMany.java @@ -28,7 +28,6 @@ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -39,12 +38,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -55,7 +57,7 @@ public class RafiqOfTheMany extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/Ragnar.java b/Mage.Sets/src/mage/cards/r/Ragnar.java index 988ae1490f4..9c707f5060f 100644 --- a/Mage.Sets/src/mage/cards/r/Ragnar.java +++ b/Mage.Sets/src/mage/cards/r/Ragnar.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +36,12 @@ import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -48,7 +50,7 @@ public class Ragnar extends CardImpl { public Ragnar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java b/Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java index 5ca49e5284b..6be7f2c579b 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java +++ b/Mage.Sets/src/mage/cards/r/RakdosLordOfRiots.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -41,16 +40,14 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +56,7 @@ public class RakdosLordOfRiots extends CardImpl { public RakdosLordOfRiots(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java b/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java index 15d601e056d..e12a71153cf 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java +++ b/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java @@ -43,6 +43,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -64,7 +65,7 @@ public class RakdosTheDefiler extends CardImpl { public RakdosTheDefiler(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/r/RakkaMar.java b/Mage.Sets/src/mage/cards/r/RakkaMar.java index 5df86e28ddf..d30dc59cee6 100644 --- a/Mage.Sets/src/mage/cards/r/RakkaMar.java +++ b/Mage.Sets/src/mage/cards/r/RakkaMar.java @@ -28,9 +28,6 @@ package mage.cards.r; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,8 +37,13 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Loki @@ -51,7 +53,7 @@ public class RakkaMar extends CardImpl { public RakkaMar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java b/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java index 4c85024abe0..e26d17ba6be 100644 --- a/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java +++ b/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java @@ -40,10 +40,7 @@ import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -62,7 +59,7 @@ public class RakshaGoldenCub extends CardImpl { public RakshaGoldenCub(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Cat"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/RamirezDePietro.java b/Mage.Sets/src/mage/cards/r/RamirezDePietro.java index 441cf83ccd8..fe5654b494f 100644 --- a/Mage.Sets/src/mage/cards/r/RamirezDePietro.java +++ b/Mage.Sets/src/mage/cards/r/RamirezDePietro.java @@ -27,12 +27,14 @@ */ package mage.cards.r; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class RamirezDePietro extends CardImpl { public RamirezDePietro(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Pirate"); diff --git a/Mage.Sets/src/mage/cards/r/RamsesOverdark.java b/Mage.Sets/src/mage/cards/r/RamsesOverdark.java index 8ba860966b9..a73944a95ba 100644 --- a/Mage.Sets/src/mage/cards/r/RamsesOverdark.java +++ b/Mage.Sets/src/mage/cards/r/RamsesOverdark.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -36,11 +35,14 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -55,7 +57,7 @@ public class RamsesOverdark extends CardImpl { public RamsesOverdark(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Assassin"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/r/RashidaScalebane.java b/Mage.Sets/src/mage/cards/r/RashidaScalebane.java index 34b13c681aa..e1a356ec978 100644 --- a/Mage.Sets/src/mage/cards/r/RashidaScalebane.java +++ b/Mage.Sets/src/mage/cards/r/RashidaScalebane.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +38,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -47,6 +47,8 @@ import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.BlockingPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -62,7 +64,7 @@ public class RashidaScalebane extends CardImpl { public RashidaScalebane(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/RashmiEternitiesCrafter.java b/Mage.Sets/src/mage/cards/r/RashmiEternitiesCrafter.java index 19146e40f53..a13f2826ea1 100644 --- a/Mage.Sets/src/mage/cards/r/RashmiEternitiesCrafter.java +++ b/Mage.Sets/src/mage/cards/r/RashmiEternitiesCrafter.java @@ -27,8 +27,6 @@ */ package mage.cards.r; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -40,6 +38,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -47,6 +46,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.watchers.common.SpellsCastWatcher; +import java.util.List; +import java.util.UUID; + /** * * @author emerald000 @@ -55,7 +57,7 @@ public class RashmiEternitiesCrafter extends CardImpl { public RashmiEternitiesCrafter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Druid"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java b/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java index 079d4b211d1..755b32951eb 100644 --- a/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java +++ b/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java @@ -27,9 +27,6 @@ */ package mage.cards.r; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -45,11 +42,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -59,6 +52,10 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author emerald000 @@ -68,7 +65,7 @@ public class RasputinDreamweaver extends CardImpl { public RasputinDreamweaver(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/r/RathsEdge.java b/Mage.Sets/src/mage/cards/r/RathsEdge.java index 265f248ef86..65bf4e6f46b 100644 --- a/Mage.Sets/src/mage/cards/r/RathsEdge.java +++ b/Mage.Sets/src/mage/cards/r/RathsEdge.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,11 +37,14 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author anonymous @@ -53,7 +55,7 @@ public class RathsEdge extends CardImpl { public RathsEdge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/r/RavosSoultender.java b/Mage.Sets/src/mage/cards/r/RavosSoultender.java index b4f976fdf97..ec2100ab10b 100644 --- a/Mage.Sets/src/mage/cards/r/RavosSoultender.java +++ b/Mage.Sets/src/mage/cards/r/RavosSoultender.java @@ -38,10 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; @@ -54,7 +51,7 @@ public class RavosSoultender extends CardImpl { public RavosSoultender(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/r/RayneAcademyChancellor.java b/Mage.Sets/src/mage/cards/r/RayneAcademyChancellor.java index 5d75c037fea..466015c348d 100644 --- a/Mage.Sets/src/mage/cards/r/RayneAcademyChancellor.java +++ b/Mage.Sets/src/mage/cards/r/RayneAcademyChancellor.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.condition.common.EnchantedSourceCondition; @@ -36,6 +35,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -43,6 +43,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 @@ -51,7 +53,7 @@ public class RayneAcademyChancellor extends CardImpl { public RayneAcademyChancellor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java b/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java index 4c22f9db518..94e60966b54 100644 --- a/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherTargetPredicate; @@ -51,6 +51,8 @@ import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -59,7 +61,7 @@ public class RaziaBorosArchangel extends CardImpl { public RaziaBorosArchangel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/r/ReaperKing.java b/Mage.Sets/src/mage/cards/r/ReaperKing.java index 62e41fbaf29..46739ee04e7 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperKing.java +++ b/Mage.Sets/src/mage/cards/r/ReaperKing.java @@ -27,10 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -39,11 +35,17 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author North @@ -61,7 +63,7 @@ public class ReaperKing extends CardImpl { public ReaperKing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2/W}{2/U}{2/B}{2/R}{2/G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Scarecrow"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/r/RekiTheHistoryOfKamigawa.java b/Mage.Sets/src/mage/cards/r/RekiTheHistoryOfKamigawa.java index 155c821118c..8dcf12b4794 100644 --- a/Mage.Sets/src/mage/cards/r/RekiTheHistoryOfKamigawa.java +++ b/Mage.Sets/src/mage/cards/r/RekiTheHistoryOfKamigawa.java @@ -34,6 +34,7 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -46,12 +47,12 @@ public class RekiTheHistoryOfKamigawa extends CardImpl { private static final FilterSpell filter = new FilterSpell("legendary spell"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public RekiTheHistoryOfKamigawa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java index 8cd41277f38..9d2b675d924 100644 --- a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java +++ b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +36,12 @@ import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEf import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; +import java.util.UUID; + /** * * @author hanasu @@ -48,7 +50,7 @@ public class RevekaWizardSavant extends CardImpl { public RevekaWizardSavant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dwarf"); this.subtype.add("Wizard"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/r/Revelation.java b/Mage.Sets/src/mage/cards/r/Revelation.java index a7356c1e477..c2036a737d9 100644 --- a/Mage.Sets/src/mage/cards/r/Revelation.java +++ b/Mage.Sets/src/mage/cards/r/Revelation.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.continuous.PlayWithHandRevealedEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; @@ -44,7 +45,7 @@ public class Revelation extends CardImpl { public Revelation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // Players play with their hands revealed. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithHandRevealedEffect(TargetController.ANY))); diff --git a/Mage.Sets/src/mage/cards/r/ReyaDawnbringer.java b/Mage.Sets/src/mage/cards/r/ReyaDawnbringer.java index e3daeefb892..bffff7f6bb3 100644 --- a/Mage.Sets/src/mage/cards/r/ReyaDawnbringer.java +++ b/Mage.Sets/src/mage/cards/r/ReyaDawnbringer.java @@ -27,9 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -37,10 +34,14 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +50,7 @@ public class ReyaDawnbringer extends CardImpl { public ReyaDawnbringer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/r/ReyhanLastOfTheAbzan.java b/Mage.Sets/src/mage/cards/r/ReyhanLastOfTheAbzan.java index cadf436437e..0bd1e59e4fe 100644 --- a/Mage.Sets/src/mage/cards/r/ReyhanLastOfTheAbzan.java +++ b/Mage.Sets/src/mage/cards/r/ReyhanLastOfTheAbzan.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -38,6 +37,7 @@ import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -47,6 +47,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +58,7 @@ public class ReyhanLastOfTheAbzan extends CardImpl { public ReyhanLastOfTheAbzan(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/r/RhysTheExiled.java b/Mage.Sets/src/mage/cards/r/RhysTheExiled.java index f033a3bebfa..3ed9cb825b2 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheExiled.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheExiled.java @@ -27,9 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -41,12 +38,16 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -62,7 +63,7 @@ public class RhysTheExiled extends CardImpl { public RhysTheExiled(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java index 9544159c16d..3d8d1f4928f 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -58,7 +59,7 @@ public class RhysTheRedeemed extends CardImpl { public RhysTheRedeemed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G/W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java index a757e902532..090c0572b15 100644 --- a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java +++ b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SetTargetPointer; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; @@ -48,6 +48,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +70,7 @@ public class RikuOfTwoReflections extends CardImpl { public RikuOfTwoReflections(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java index 52883b03773..6fb01fcf536 100644 --- a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java +++ b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleEvasionAbility; @@ -41,17 +40,15 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -68,7 +65,7 @@ public class RimeTransfusion extends CardImpl { public RimeTransfusion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Aura"); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/r/RimeboundDead.java b/Mage.Sets/src/mage/cards/r/RimeboundDead.java index 0464e4b5c80..5e95ad2b316 100644 --- a/Mage.Sets/src/mage/cards/r/RimeboundDead.java +++ b/Mage.Sets/src/mage/cards/r/RimeboundDead.java @@ -27,16 +27,18 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox @@ -45,7 +47,7 @@ public class RimeboundDead extends CardImpl { public RimeboundDead(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Skeleton"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/r/RishkarPeemaRenegade.java b/Mage.Sets/src/mage/cards/r/RishkarPeemaRenegade.java index e29cb783c35..49622549011 100644 --- a/Mage.Sets/src/mage/cards/r/RishkarPeemaRenegade.java +++ b/Mage.Sets/src/mage/cards/r/RishkarPeemaRenegade.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -40,12 +39,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.CounterAnyPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -61,7 +63,7 @@ public class RishkarPeemaRenegade extends CardImpl { public RishkarPeemaRenegade(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Druid"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/r/RithTheAwakener.java b/Mage.Sets/src/mage/cards/r/RithTheAwakener.java index b54620ce2c9..079581fd984 100644 --- a/Mage.Sets/src/mage/cards/r/RithTheAwakener.java +++ b/Mage.Sets/src/mage/cards/r/RithTheAwakener.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,12 +40,15 @@ import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.game.permanent.token.SaprolingToken; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +57,7 @@ public class RithTheAwakener extends CardImpl { public RithTheAwakener(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/r/RivenTurnbull.java b/Mage.Sets/src/mage/cards/r/RivenTurnbull.java index b5efa4496bf..3f549800f8f 100644 --- a/Mage.Sets/src/mage/cards/r/RivenTurnbull.java +++ b/Mage.Sets/src/mage/cards/r/RivenTurnbull.java @@ -27,12 +27,14 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -42,7 +44,7 @@ public class RivenTurnbull extends CardImpl { public RivenTurnbull(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/r/RofellosLlanowarEmissary.java b/Mage.Sets/src/mage/cards/r/RofellosLlanowarEmissary.java index a590af96840..fcec1ab8dd3 100644 --- a/Mage.Sets/src/mage/cards/r/RofellosLlanowarEmissary.java +++ b/Mage.Sets/src/mage/cards/r/RofellosLlanowarEmissary.java @@ -28,17 +28,19 @@ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.mana.DynamicManaAbility; -import mage.constants.CardType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author Backfir3 @@ -53,7 +55,7 @@ public class RofellosLlanowarEmissary extends CardImpl { public RofellosLlanowarEmissary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java index 1896757dca6..e4aeaf4b55f 100644 --- a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java +++ b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -44,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -53,6 +53,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -67,7 +69,7 @@ public class RoonOfTheHiddenRealm extends CardImpl { public RoonOfTheHiddenRealm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Rhino"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/r/RorixBladewing.java b/Mage.Sets/src/mage/cards/r/RorixBladewing.java index f02d3fd1c72..fd51fbe3b3d 100644 --- a/Mage.Sets/src/mage/cards/r/RorixBladewing.java +++ b/Mage.Sets/src/mage/cards/r/RorixBladewing.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; /** * @@ -43,7 +44,7 @@ public class RorixBladewing extends CardImpl { public RorixBladewing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/r/RosheenMeanderer.java b/Mage.Sets/src/mage/cards/r/RosheenMeanderer.java index 11c6b0fb836..9644fa6b544 100644 --- a/Mage.Sets/src/mage/cards/r/RosheenMeanderer.java +++ b/Mage.Sets/src/mage/cards/r/RosheenMeanderer.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.ConditionalMana; import mage.MageInt; import mage.MageObject; @@ -40,8 +39,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityType; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.Game; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -50,7 +52,7 @@ public class RosheenMeanderer extends CardImpl { public RosheenMeanderer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R/G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Giant"); this.subtype.add("Shaman"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/r/Rowen.java b/Mage.Sets/src/mage/cards/r/Rowen.java index 4c8c0c6f0e6..af72ca25d10 100644 --- a/Mage.Sets/src/mage/cards/r/Rowen.java +++ b/Mage.Sets/src/mage/cards/r/Rowen.java @@ -99,7 +99,7 @@ class RowenAbility extends TriggeredAbilityImpl { lastTriggeredTurn = game.getTurnNum(); controller.revealCards(sourcePermanent.getName(), new CardsImpl(card), game); this.getEffects().clear(); - if (card.isLand() && card.getSupertype().contains("Basic")) { + if (card.isLand() && card.isBasic()) { this.addEffect(new DrawCardSourceControllerEffect(1)); } return true; diff --git a/Mage.Sets/src/mage/cards/r/RubiniaSoulsinger.java b/Mage.Sets/src/mage/cards/r/RubiniaSoulsinger.java index cac5ad24427..a2350f8948e 100644 --- a/Mage.Sets/src/mage/cards/r/RubiniaSoulsinger.java +++ b/Mage.Sets/src/mage/cards/r/RubiniaSoulsinger.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,11 +39,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class RubiniaSoulsinger extends CardImpl { public RubiniaSoulsinger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Faerie"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java b/Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java index 9e8d73835cb..0868cbf44f0 100644 --- a/Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java +++ b/Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java @@ -27,15 +27,17 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.common.combat.AttackIfAbleTargetRandomOpponentSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author LevelX2 @@ -44,7 +46,7 @@ public class RuhanOfTheFomori extends CardImpl { public RuhanOfTheFomori(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Giant"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java b/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java index ed1bccf8b8a..69a3ff8581a 100644 --- a/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java +++ b/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -37,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreatureInPlay; import mage.game.Game; @@ -44,6 +44,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +54,7 @@ public class RuneTailKitsuneAscendant extends CardImpl { public RuneTailKitsuneAscendant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Fox"); this.subtype.add("Monk"); @@ -110,7 +112,7 @@ class RuneTailEssence extends Token { RuneTailEssence() { super("Rune-Tail's Essence", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.ENCHANTMENT); color.setWhite(true); diff --git a/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java b/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java index c28da88fbdc..f9adbcc8e2e 100644 --- a/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java +++ b/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AttacksEachTurnStaticAbility; @@ -38,6 +37,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -45,6 +45,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -53,7 +55,7 @@ public class RuricTharTheUnbowed extends CardImpl { public RuricTharTheUnbowed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ogre"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/r/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/cards/r/RyuseiTheFallingStar.java index 43a2137ac1c..d425acf4928 100644 --- a/Mage.Sets/src/mage/cards/r/RyuseiTheFallingStar.java +++ b/Mage.Sets/src/mage/cards/r/RyuseiTheFallingStar.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -54,7 +55,7 @@ public class RyuseiTheFallingStar extends CardImpl { public RyuseiTheFallingStar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java b/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java index 5c8da52f345..91a0d5a8708 100644 --- a/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java +++ b/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -59,7 +60,7 @@ public class SachiDaughterOfSeshiro extends CardImpl { public SachiDaughterOfSeshiro(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Snake"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/s/SaffiEriksdotter.java b/Mage.Sets/src/mage/cards/s/SaffiEriksdotter.java index 292a8cf7ffe..3c70722ee36 100644 --- a/Mage.Sets/src/mage/cards/s/SaffiEriksdotter.java +++ b/Mage.Sets/src/mage/cards/s/SaffiEriksdotter.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -37,10 +36,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -50,6 +46,8 @@ import mage.target.Target; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Plopman @@ -58,7 +56,7 @@ public class SaffiEriksdotter extends CardImpl { public SaffiEriksdotter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Scout"); diff --git a/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java b/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java index 3f8920681c5..ee8f447117c 100644 --- a/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java +++ b/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java @@ -28,6 +28,7 @@ package mage.cards.s; import java.util.UUID; + import mage.MageInt; import mage.MageObject; import mage.abilities.common.EntersBattlefieldAbility; @@ -41,6 +42,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -48,14 +50,13 @@ import mage.game.permanent.Permanent; import mage.util.functions.ApplyToPermanent; /** - * * @author LevelX2 */ public class SakashimaTheImpostor extends CardImpl { public SakashimaTheImpostor(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(3); @@ -81,9 +82,8 @@ class SakashimaTheImpostorApplier extends ApplyToPermanent { @Override public boolean apply(Game game, Permanent permanent) { - if (!permanent.getSupertype().contains("Legendary")) { - permanent.getSupertype().add("Legendary"); - } + permanent.addSuperType(SuperType.LEGENDARY); + permanent.setName("Sakashima the Impostor"); // {2}{U}{U}: Return Sakashima the Impostor to its owner's hand at the beginning of the next end step permanent.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, @@ -95,9 +95,7 @@ class SakashimaTheImpostorApplier extends ApplyToPermanent { @Override public boolean apply(Game game, MageObject mageObject) { - if (!mageObject.getSupertype().contains("Legendary")) { - mageObject.getSupertype().add("Legendary"); - } + mageObject.addSuperType(SuperType.LEGENDARY); mageObject.setName("Sakashima the Impostor"); // {2}{U}{U}: Return Sakashima the Impostor to its owner's hand at the beginning of the next end step mageObject.getAbilities().add(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/s/SakikoMotherOfSummer.java b/Mage.Sets/src/mage/cards/s/SakikoMotherOfSummer.java index f8fc912ea9a..5c901030ae5 100644 --- a/Mage.Sets/src/mage/cards/s/SakikoMotherOfSummer.java +++ b/Mage.Sets/src/mage/cards/s/SakikoMotherOfSummer.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.TriggeredAbilityImpl; @@ -36,6 +35,7 @@ import mage.abilities.effects.common.AddManaToManaPoolTargetControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -44,6 +44,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +54,7 @@ public class SakikoMotherOfSummer extends CardImpl { public SakikoMotherOfSummer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Snake"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/s/SaplingOfColfenor.java b/Mage.Sets/src/mage/cards/s/SaplingOfColfenor.java index 2038e8c1aef..30dfc184deb 100644 --- a/Mage.Sets/src/mage/cards/s/SaplingOfColfenor.java +++ b/Mage.Sets/src/mage/cards/s/SaplingOfColfenor.java @@ -27,24 +27,22 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.IndestructibleAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -54,7 +52,7 @@ public class SaplingOfColfenor extends CardImpl { public SaplingOfColfenor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B/G}{B/G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Treefolk"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java b/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java index e2d398855d6..c89413f0b28 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java @@ -46,13 +46,7 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -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.game.Game; import mage.game.command.Emblem; import mage.game.permanent.Permanent; @@ -127,8 +121,8 @@ class SarkhanTheDragonspeakerEffect extends ContinuousEffectImpl { permanent.getCardType().add(CardType.CREATURE); permanent.getSubtype(game).clear(); permanent.getSubtype(game).add("Dragon"); - permanent.getSupertype().clear(); - permanent.getSupertype().add("Legendary"); + permanent.getSuperType().clear(); + permanent.addSuperType(SuperType.LEGENDARY); } break; case ColorChangingEffects_5: diff --git a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java index bd1bc9cf559..f786551d776 100644 --- a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java +++ b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -41,10 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceColor; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandCard; @@ -57,6 +53,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -65,7 +63,7 @@ public class SasayaOrochiAscendant extends CardImpl { public SasayaOrochiAscendant(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Snake"); this.subtype.add("Monk"); @@ -122,7 +120,7 @@ class SasayasEssence extends Token { SasayasEssence() { super("Sasaya's Essence", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.ENCHANTMENT); color.setGreen(true); diff --git a/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java b/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java index d9c1e05561b..fd6380b05ac 100644 --- a/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java +++ b/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java @@ -41,6 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SetTargetPointer; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.players.Player; @@ -54,7 +55,7 @@ public class SaskiaTheUnyielding extends CardImpl { public SaskiaTheUnyielding(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{R}{G}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java b/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java index fe7338f4177..e4806e7ab86 100644 --- a/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java +++ b/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java @@ -27,9 +27,6 @@ */ package mage.cards.s; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -41,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -50,6 +48,10 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author fireshoes @@ -58,7 +60,7 @@ public class SavraQueenOfTheGolgari extends CardImpl { public SavraQueenOfTheGolgari(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Shaman"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java b/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java index 3f08b9b3b82..2854fdeebc2 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * @author duncant */ @@ -57,7 +55,7 @@ public class ScionOfTheUrDragon extends CardImpl { public ScionOfTheUrDragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Avatar"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/s/ScryingSheets.java b/Mage.Sets/src/mage/cards/s/ScryingSheets.java index 25024d50d59..4125e6cf87a 100644 --- a/Mage.Sets/src/mage/cards/s/ScryingSheets.java +++ b/Mage.Sets/src/mage/cards/s/ScryingSheets.java @@ -41,6 +41,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -53,7 +54,7 @@ public class ScryingSheets extends CardImpl { public ScryingSheets(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); @@ -100,7 +101,7 @@ class ScryingSheetsEffect extends OneShotEffect { CardsImpl cards = new CardsImpl(); cards.add(card); controller.lookAtCards(sourceObject.getIdName(), cards, game); - if (card.getSupertype().contains("Snow")) { + if (card.isSnow()) { if (controller.chooseUse(outcome, "Reveal " + card.getLogName() + " and put it into your hand?", source, game)) { controller.moveCards(card, Zone.HAND, source, game); controller.revealCards(sourceObject.getIdName(), cards, game); diff --git a/Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java b/Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java index eb0e3229b0b..824fc151353 100644 --- a/Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java +++ b/Mage.Sets/src/mage/cards/s/SedrisTheTraitorKing.java @@ -49,7 +49,7 @@ public class SedrisTheTraitorKing extends CardImpl { public SedrisTheTraitorKing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/s/SeizanPerverterOfTruth.java b/Mage.Sets/src/mage/cards/s/SeizanPerverterOfTruth.java index 3b3b0af6b40..85c08af789b 100644 --- a/Mage.Sets/src/mage/cards/s/SeizanPerverterOfTruth.java +++ b/Mage.Sets/src/mage/cards/s/SeizanPerverterOfTruth.java @@ -28,9 +28,6 @@ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,8 +36,12 @@ import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +50,7 @@ public class SeizanPerverterOfTruth extends CardImpl { public SeizanPerverterOfTruth (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java index 7a26d72f96e..8c4506cf07d 100644 --- a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java +++ b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -35,6 +34,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -43,6 +43,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +60,7 @@ public class SekKuarDeathkeeper extends CardImpl { public SekKuarDeathkeeper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Orc"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java b/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java index c19798d3723..f904c9a51fa 100644 --- a/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java +++ b/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -52,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.SpiritToken; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -66,7 +68,7 @@ public class SekkiSeasonsGuide extends CardImpl { public SekkiSeasonsGuide(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java b/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java index 266cc5e6d17..42d83e71093 100644 --- a/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java +++ b/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; import mage.constants.Zone; /** @@ -47,7 +48,7 @@ public class SeleniaDarkAngel extends CardImpl { public SeleniaDarkAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); diff --git a/Mage.Sets/src/mage/cards/s/SelvalaExplorerReturned.java b/Mage.Sets/src/mage/cards/s/SelvalaExplorerReturned.java index 3020d82c760..4d3bd3b4a7e 100644 --- a/Mage.Sets/src/mage/cards/s/SelvalaExplorerReturned.java +++ b/Mage.Sets/src/mage/cards/s/SelvalaExplorerReturned.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -42,10 +41,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +56,7 @@ public class SelvalaExplorerReturned extends CardImpl { public SelvalaExplorerReturned(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java b/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java index 53f776fdb4c..5810bafeff0 100644 --- a/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java @@ -68,7 +68,7 @@ public class SelvalaHeartOfTheWilds extends CardImpl { public SelvalaHeartOfTheWilds(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Scout"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SenTriplets.java b/Mage.Sets/src/mage/cards/s/SenTriplets.java index 886aed07647..3f86555354f 100644 --- a/Mage.Sets/src/mage/cards/s/SenTriplets.java +++ b/Mage.Sets/src/mage/cards/s/SenTriplets.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -38,19 +37,14 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -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.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +53,7 @@ public class SenTriplets extends CardImpl { public SenTriplets(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java b/Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java index 056d1d57cd3..97cbb2d7206 100644 --- a/Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java +++ b/Mage.Sets/src/mage/cards/s/SenatorBailOrgana.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.CountType; import mage.abilities.common.SimpleStaticAbility; @@ -38,9 +37,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -49,7 +51,7 @@ public class SenatorBailOrgana extends CardImpl { public SenatorBailOrgana(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SenatorLottDod.java b/Mage.Sets/src/mage/cards/s/SenatorLottDod.java index c4a01c924ed..3b677b1866f 100644 --- a/Mage.Sets/src/mage/cards/s/SenatorLottDod.java +++ b/Mage.Sets/src/mage/cards/s/SenatorLottDod.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -36,17 +35,15 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -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.players.Player; import mage.target.Target; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author Styxo @@ -55,7 +52,7 @@ public class SenatorLottDod extends CardImpl { public SenatorLottDod(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Neimoidian"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SenatorOnacondaFarr.java b/Mage.Sets/src/mage/cards/s/SenatorOnacondaFarr.java index b382d5dc02c..fa1756e2a90 100644 --- a/Mage.Sets/src/mage/cards/s/SenatorOnacondaFarr.java +++ b/Mage.Sets/src/mage/cards/s/SenatorOnacondaFarr.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -36,9 +35,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -47,7 +49,7 @@ public class SenatorOnacondaFarr extends CardImpl { public SenatorOnacondaFarr(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Rodian"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SenatorPadmeAmidala.java b/Mage.Sets/src/mage/cards/s/SenatorPadmeAmidala.java index 039283ac675..b5cdbed73e2 100644 --- a/Mage.Sets/src/mage/cards/s/SenatorPadmeAmidala.java +++ b/Mage.Sets/src/mage/cards/s/SenatorPadmeAmidala.java @@ -27,13 +27,15 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DrawCardControllerTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class SenatorPadmeAmidala extends CardImpl { public SenatorPadmeAmidala(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SenatorPasselArgente.java b/Mage.Sets/src/mage/cards/s/SenatorPasselArgente.java index 15ded015a99..fb1bed79197 100644 --- a/Mage.Sets/src/mage/cards/s/SenatorPasselArgente.java +++ b/Mage.Sets/src/mage/cards/s/SenatorPasselArgente.java @@ -27,13 +27,15 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class SenatorPasselArgente extends CardImpl { public SenatorPasselArgente(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Koorivar"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SenseiGoldenTail.java b/Mage.Sets/src/mage/cards/s/SenseiGoldenTail.java index da339fd9818..10e6cdeee09 100644 --- a/Mage.Sets/src/mage/cards/s/SenseiGoldenTail.java +++ b/Mage.Sets/src/mage/cards/s/SenseiGoldenTail.java @@ -28,10 +28,6 @@ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -43,10 +39,15 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.Counter; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX @@ -55,7 +56,7 @@ public class SenseiGoldenTail extends CardImpl { public SenseiGoldenTail (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Fox"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/s/SerraAviary.java b/Mage.Sets/src/mage/cards/s/SerraAviary.java index 234c1a90f51..a240f39e938 100644 --- a/Mage.Sets/src/mage/cards/s/SerraAviary.java +++ b/Mage.Sets/src/mage/cards/s/SerraAviary.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -53,7 +54,7 @@ public class SerraAviary extends CardImpl { public SerraAviary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // Creatures with flying get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, false))); diff --git a/Mage.Sets/src/mage/cards/s/SerrasSanctum.java b/Mage.Sets/src/mage/cards/s/SerrasSanctum.java index f29332aa91e..ab164d4b3c3 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasSanctum.java +++ b/Mage.Sets/src/mage/cards/s/SerrasSanctum.java @@ -28,16 +28,18 @@ package mage.cards.s; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Backfir3 @@ -53,7 +55,7 @@ public class SerrasSanctum extends CardImpl { public SerrasSanctum(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); DynamicManaAbility ability = new DynamicManaAbility(Mana.WhiteMana(1), new PermanentsOnBattlefieldCount(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java b/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java index 63bbd81f559..9db22ce1748 100644 --- a/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java +++ b/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java @@ -28,7 +28,6 @@ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,6 +47,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author Loki */ @@ -60,7 +62,7 @@ public class SeshiroTheAnointed extends CardImpl { public SeshiroTheAnointed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Snake"); this.subtype.add("Monk"); diff --git a/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java b/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java index 553101d52c8..eb4d345b773 100644 --- a/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java +++ b/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java @@ -35,6 +35,7 @@ import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -57,7 +58,7 @@ public class SetonKrosanProtector extends CardImpl { public SetonKrosanProtector(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Centaur"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/cards/s/SharuumTheHegemon.java b/Mage.Sets/src/mage/cards/s/SharuumTheHegemon.java index 99c54dc28a1..ddbffc94819 100644 --- a/Mage.Sets/src/mage/cards/s/SharuumTheHegemon.java +++ b/Mage.Sets/src/mage/cards/s/SharuumTheHegemon.java @@ -27,8 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,9 +34,13 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterArtifactCard; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author North @@ -47,7 +49,7 @@ public class SharuumTheHegemon extends CardImpl { public SharuumTheHegemon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Sphinx"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java index a1772568d56..5521a38d62c 100644 --- a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java +++ b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java @@ -27,8 +27,6 @@ */ package mage.cards.s; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -50,6 +49,9 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +60,7 @@ public class ShattergangBrothers extends CardImpl { public ShattergangBrothers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Artificer"); diff --git a/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java b/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java index 49d5a5cd02e..1d9bf7096f5 100644 --- a/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java +++ b/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterSpell; @@ -56,6 +56,8 @@ import mage.target.TargetSpell; import mage.target.common.TargetCardInExile; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 @@ -70,7 +72,7 @@ public class ShellOfTheLastKappa extends CardImpl { public ShellOfTheLastKappa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {3}, {tap}: Exile target instant or sorcery spell that targets you. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShellOfTheLastKappaEffect(), new ManaCostsImpl("{3}")); diff --git a/Mage.Sets/src/mage/cards/s/SheoldredWhisperingOne.java b/Mage.Sets/src/mage/cards/s/SheoldredWhisperingOne.java index 8c6e31d4e7d..6ce56c62038 100644 --- a/Mage.Sets/src/mage/cards/s/SheoldredWhisperingOne.java +++ b/Mage.Sets/src/mage/cards/s/SheoldredWhisperingOne.java @@ -28,9 +28,6 @@ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,11 +36,15 @@ import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki @@ -52,7 +53,7 @@ public class SheoldredWhisperingOne extends CardImpl { public SheoldredWhisperingOne (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Praetor"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java b/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java index 8d764634c2b..ecfc2c9e9de 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java @@ -27,12 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; @@ -42,11 +36,14 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author North @@ -65,7 +62,7 @@ public class ShieldOfKaldra extends CardImpl { public ShieldOfKaldra(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra are indestructible. diff --git a/Mage.Sets/src/mage/cards/s/ShimatsuTheBloodcloaked.java b/Mage.Sets/src/mage/cards/s/ShimatsuTheBloodcloaked.java index 3128c1187f7..9393746a364 100644 --- a/Mage.Sets/src/mage/cards/s/ShimatsuTheBloodcloaked.java +++ b/Mage.Sets/src/mage/cards/s/ShimatsuTheBloodcloaked.java @@ -34,10 +34,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; @@ -56,7 +53,7 @@ public class ShimatsuTheBloodcloaked extends CardImpl { public ShimatsuTheBloodcloaked(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java b/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java index 030003c63e1..e3ad49738c2 100644 --- a/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java +++ b/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java @@ -57,7 +57,7 @@ public class ShinkaTheBloodsoakedKeep extends CardImpl { public ShinkaTheBloodsoakedKeep(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.addAbility(new RedManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/ShireiShizosCaretaker.java b/Mage.Sets/src/mage/cards/s/ShireiShizosCaretaker.java index 7b6fc39f943..b274a7f8464 100644 --- a/Mage.Sets/src/mage/cards/s/ShireiShizosCaretaker.java +++ b/Mage.Sets/src/mage/cards/s/ShireiShizosCaretaker.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -49,6 +49,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 @@ -57,7 +59,7 @@ public class ShireiShizosCaretaker extends CardImpl { public ShireiShizosCaretaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java b/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java index d15cfdbdd47..3a3fbe710cc 100644 --- a/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java +++ b/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java @@ -27,9 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -37,10 +34,14 @@ import mage.abilities.effects.common.SacrificeControllerEffect; import mage.abilities.effects.common.SkipNextPlayerUntapStepEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LevelX @@ -56,7 +57,7 @@ public class ShisatoWhisperingHunter extends CardImpl { public ShisatoWhisperingHunter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Snake"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/s/ShivanGorge.java b/Mage.Sets/src/mage/cards/s/ShivanGorge.java index 6ad260c8e5d..8c504d63602 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanGorge.java +++ b/Mage.Sets/src/mage/cards/s/ShivanGorge.java @@ -27,10 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,6 +35,12 @@ import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.TargetController; +import mage.constants.Zone; + +import java.util.UUID; /** * @@ -48,7 +50,7 @@ public class ShivanGorge extends CardImpl { public ShivanGorge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java b/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java index 6a45678340d..586873b3749 100644 --- a/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java +++ b/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java @@ -57,7 +57,7 @@ public class ShizoDeathsStorehouse extends CardImpl { public ShizoDeathsStorehouse(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.addAbility(new BlackManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java b/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java index 5e3adfe17d8..c994b5ca716 100644 --- a/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java +++ b/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -36,9 +35,12 @@ import mage.abilities.effects.common.AddManaToManaPoolTargetControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -47,7 +49,7 @@ public class ShizukoCallerOfAutumn extends CardImpl { public ShizukoCallerOfAutumn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Snake"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/s/ShuYunTheSilentTempest.java b/Mage.Sets/src/mage/cards/s/ShuYunTheSilentTempest.java index af63e630902..a90516bcd49 100644 --- a/Mage.Sets/src/mage/cards/s/ShuYunTheSilentTempest.java +++ b/Mage.Sets/src/mage/cards/s/ShuYunTheSilentTempest.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -40,11 +39,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +61,7 @@ public class ShuYunTheSilentTempest extends CardImpl { public ShuYunTheSilentTempest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Monk"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SidarJabari.java b/Mage.Sets/src/mage/cards/s/SidarJabari.java index cdb73376a21..f1ddedcc2a1 100644 --- a/Mage.Sets/src/mage/cards/s/SidarJabari.java +++ b/Mage.Sets/src/mage/cards/s/SidarJabari.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -51,7 +52,7 @@ public class SidarJabari extends CardImpl { public SidarJabari(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java b/Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java index f105e6aed95..b28a460fb86 100644 --- a/Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java +++ b/Mage.Sets/src/mage/cards/s/SidarKondoOfJamuraa.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; @@ -48,6 +48,8 @@ import mage.filter.predicate.mageobject.PowerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -63,7 +65,7 @@ public class SidarKondoOfJamuraa extends CardImpl { public SidarKondoOfJamuraa(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java b/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java index c3504254bf6..a2293bd07ba 100644 --- a/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java +++ b/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java @@ -27,9 +27,6 @@ */ package mage.cards.s; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; @@ -39,12 +36,16 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeGroupEvent; import mage.game.permanent.token.ZombieToken; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +54,7 @@ public class SidisiBroodTyrant extends CardImpl { public SidisiBroodTyrant(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Naga"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java b/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java index af30037bbeb..0b0932156b2 100644 --- a/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java +++ b/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ExploitCreatureTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; @@ -36,9 +35,12 @@ import mage.abilities.keyword.ExploitAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -47,7 +49,7 @@ public class SidisiUndeadVizier extends CardImpl { public SidisiUndeadVizier(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Naga"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java index 2f7ee13739e..e039265b393 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java @@ -43,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -65,7 +66,7 @@ public class SigardaHeronsGrace extends CardImpl { public SigardaHeronsGrace(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java b/Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java index 3c262f6af9d..441e6cec3e1 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHostOfHerons.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -38,15 +37,14 @@ import mage.abilities.keyword.HexproofAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.PermanentCard; import mage.game.stack.Spell; +import java.util.UUID; + /** * @author noxx */ @@ -54,7 +52,7 @@ public class SigardaHostOfHerons extends CardImpl { public SigardaHostOfHerons(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/s/SilasRennSeekerAdept.java b/Mage.Sets/src/mage/cards/s/SilasRennSeekerAdept.java index fbc68cb25a1..36f806b4678 100644 --- a/Mage.Sets/src/mage/cards/s/SilasRennSeekerAdept.java +++ b/Mage.Sets/src/mage/cards/s/SilasRennSeekerAdept.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -36,15 +35,14 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterArtifactCard; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +54,7 @@ public class SilasRennSeekerAdept extends CardImpl { public SilasRennSeekerAdept(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java b/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java index 29fdad4aa4b..f608bfc2e56 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java @@ -27,8 +27,6 @@ */ package mage.cards.s; -import java.util.Iterator; -import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; @@ -38,19 +36,16 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.SubLayer; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.Iterator; +import java.util.UUID; + /** * * @author LevelX2 @@ -66,7 +61,7 @@ public class SilumgarTheDriftingDeath extends CardImpl { public SilumgarTheDriftingDeath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(3); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java b/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java index df5a75345d4..49514209e7f 100644 --- a/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java +++ b/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,8 +35,11 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -46,7 +48,7 @@ public class SilvosRogueElemental extends CardImpl { public SilvosRogueElemental(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java b/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java index 40c9b7f8a3b..97306898f65 100644 --- a/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java +++ b/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -36,10 +35,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author LoneFox @@ -54,7 +56,7 @@ public class SimaYiWeiFieldMarshal extends CardImpl { public SimaYiWeiFieldMarshal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/s/SirShandlarOfEberyn.java b/Mage.Sets/src/mage/cards/s/SirShandlarOfEberyn.java index fadd67c6e8c..d123a30c853 100644 --- a/Mage.Sets/src/mage/cards/s/SirShandlarOfEberyn.java +++ b/Mage.Sets/src/mage/cards/s/SirShandlarOfEberyn.java @@ -27,11 +27,13 @@ */ package mage.cards.s; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class SirShandlarOfEberyn extends CardImpl { public SirShandlarOfEberyn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/cards/s/SistersOfStoneDeath.java b/Mage.Sets/src/mage/cards/s/SistersOfStoneDeath.java index d2ed6b0a1b5..13d12e334c1 100644 --- a/Mage.Sets/src/mage/cards/s/SistersOfStoneDeath.java +++ b/Mage.Sets/src/mage/cards/s/SistersOfStoneDeath.java @@ -42,6 +42,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; @@ -64,7 +65,7 @@ public class SistersOfStoneDeath extends CardImpl { public SistersOfStoneDeath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}{G}{G}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Gorgon"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/s/SivitriScarzam.java b/Mage.Sets/src/mage/cards/s/SivitriScarzam.java index 379d8246d45..47511f38414 100644 --- a/Mage.Sets/src/mage/cards/s/SivitriScarzam.java +++ b/Mage.Sets/src/mage/cards/s/SivitriScarzam.java @@ -27,11 +27,13 @@ */ package mage.cards.s; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class SivitriScarzam extends CardImpl { public SivitriScarzam(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/s/SkeletonShip.java b/Mage.Sets/src/mage/cards/s/SkeletonShip.java index 612b9cb909d..ff98a575ba4 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletonShip.java +++ b/Mage.Sets/src/mage/cards/s/SkeletonShip.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility; @@ -38,12 +37,15 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.Filter; import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -52,7 +54,7 @@ public class SkeletonShip extends CardImpl { public SkeletonShip(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Skeleton"); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java b/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java index 8f62296b72f..68188faa69b 100644 --- a/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java +++ b/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java @@ -28,20 +28,22 @@ package mage.cards.s; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.RegenerateSourceEffect; +import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; +import mage.constants.Zone; + +import java.util.UUID; /** * @@ -51,7 +53,7 @@ public class SkithiryxTheBlightDragon extends CardImpl { public SkithiryxTheBlightDragon (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Skeleton"); diff --git a/Mage.Sets/src/mage/cards/s/SkullbriarTheWalkingGrave.java b/Mage.Sets/src/mage/cards/s/SkullbriarTheWalkingGrave.java index 17ebe128f96..261f63555f5 100644 --- a/Mage.Sets/src/mage/cards/s/SkullbriarTheWalkingGrave.java +++ b/Mage.Sets/src/mage/cards/s/SkullbriarTheWalkingGrave.java @@ -57,7 +57,7 @@ public class SkullbriarTheWalkingGrave extends CardImpl { public SkullbriarTheWalkingGrave(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Elemental"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/s/SkyfireKirin.java b/Mage.Sets/src/mage/cards/s/SkyfireKirin.java index 3525d9fbc28..85f59eb63f0 100644 --- a/Mage.Sets/src/mage/cards/s/SkyfireKirin.java +++ b/Mage.Sets/src/mage/cards/s/SkyfireKirin.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -37,10 +36,7 @@ import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -54,6 +50,8 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +62,7 @@ public class SkyfireKirin extends CardImpl { public SkyfireKirin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kirin"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java index 35ac026dc9d..155c5f50f83 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java +++ b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java @@ -5,7 +5,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -19,6 +18,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -29,6 +29,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author nick.myers @@ -37,7 +39,7 @@ public class SkyshipWeatherlight extends CardImpl { public SkyshipWeatherlight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // When Skyship Weatherlight enters the battlefield, search your library for any number of artifact and/or creature cards and exile them. Then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SkyshipWeatherlightEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/s/SkysovereignConsulFlagship.java b/Mage.Sets/src/mage/cards/s/SkysovereignConsulFlagship.java index 4b6a8563945..5dbae40d07f 100644 --- a/Mage.Sets/src/mage/cards/s/SkysovereignConsulFlagship.java +++ b/Mage.Sets/src/mage/cards/s/SkysovereignConsulFlagship.java @@ -28,6 +28,7 @@ package mage.cards.s; import java.util.UUID; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; @@ -37,13 +38,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreatureOrPlaneswalker; /** - * * @author emerald000 */ public class SkysovereignConsulFlagship extends CardImpl { @@ -56,7 +57,7 @@ public class SkysovereignConsulFlagship extends CardImpl { public SkysovereignConsulFlagship(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vehicle"); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/s/SlaveI.java b/Mage.Sets/src/mage/cards/s/SlaveI.java index dd7d3f6c30a..fe5304f52f7 100644 --- a/Mage.Sets/src/mage/cards/s/SlaveI.java +++ b/Mage.Sets/src/mage/cards/s/SlaveI.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -36,8 +35,11 @@ import mage.abilities.keyword.SpaceflightAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author Styxo @@ -46,7 +48,7 @@ public class SlaveI extends CardImpl { public SlaveI(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Starship"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SliverHivelord.java b/Mage.Sets/src/mage/cards/s/SliverHivelord.java index 36a97d4acfe..c72d7b531a5 100644 --- a/Mage.Sets/src/mage/cards/s/SliverHivelord.java +++ b/Mage.Sets/src/mage/cards/s/SliverHivelord.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.StaticFilters; @@ -47,7 +48,7 @@ public class SliverHivelord extends CardImpl { public SliverHivelord(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Sliver"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/s/SliverLegion.java b/Mage.Sets/src/mage/cards/s/SliverLegion.java index 80409d61002..bc5b0a970ea 100644 --- a/Mage.Sets/src/mage/cards/s/SliverLegion.java +++ b/Mage.Sets/src/mage/cards/s/SliverLegion.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -36,11 +35,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; -import mage.filter.common.FilterCreaturePermanent; import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author KholdFuzion @@ -57,7 +59,7 @@ public class SliverLegion extends CardImpl { public SliverLegion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Sliver"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/s/SliverOverlord.java b/Mage.Sets/src/mage/cards/s/SliverOverlord.java index 152d13db387..b003d7dafdd 100644 --- a/Mage.Sets/src/mage/cards/s/SliverOverlord.java +++ b/Mage.Sets/src/mage/cards/s/SliverOverlord.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; @@ -46,6 +46,8 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author cbt33 @@ -60,7 +62,7 @@ public class SliverOverlord extends CardImpl { public SliverOverlord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Sliver"); this.subtype.add("Mutant"); diff --git a/Mage.Sets/src/mage/cards/s/SliverQueen.java b/Mage.Sets/src/mage/cards/s/SliverQueen.java index 908753ee2c1..7e28e605dcb 100644 --- a/Mage.Sets/src/mage/cards/s/SliverQueen.java +++ b/Mage.Sets/src/mage/cards/s/SliverQueen.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -35,9 +34,12 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.permanent.token.SliverToken; +import java.util.UUID; + /** * * @author cbt33 @@ -46,7 +48,7 @@ public class SliverQueen extends CardImpl { public SliverQueen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Sliver"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/s/SlobadGoblinTinkerer.java b/Mage.Sets/src/mage/cards/s/SlobadGoblinTinkerer.java index 09c51090d43..8f14218c77b 100644 --- a/Mage.Sets/src/mage/cards/s/SlobadGoblinTinkerer.java +++ b/Mage.Sets/src/mage/cards/s/SlobadGoblinTinkerer.java @@ -32,6 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; @@ -63,7 +64,7 @@ public class SlobadGoblinTinkerer extends CardImpl { public SlobadGoblinTinkerer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Artificer"); diff --git a/Mage.Sets/src/mage/cards/s/SmolderingMarsh.java b/Mage.Sets/src/mage/cards/s/SmolderingMarsh.java index 29ead2b7c71..46e2d234d0b 100644 --- a/Mage.Sets/src/mage/cards/s/SmolderingMarsh.java +++ b/Mage.Sets/src/mage/cards/s/SmolderingMarsh.java @@ -41,6 +41,7 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -53,7 +54,7 @@ public class SmolderingMarsh extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public SmolderingMarsh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SnowCoveredForest.java b/Mage.Sets/src/mage/cards/s/SnowCoveredForest.java index ac8a76ff343..c2dc151e5f2 100644 --- a/Mage.Sets/src/mage/cards/s/SnowCoveredForest.java +++ b/Mage.Sets/src/mage/cards/s/SnowCoveredForest.java @@ -32,6 +32,7 @@ import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -41,8 +42,8 @@ public class SnowCoveredForest extends CardImpl { public SnowCoveredForest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Basic"); - this.supertype.add("Snow"); + this.addSuperType(SuperType.BASIC); + this.addSuperType(SuperType.SNOW); this.subtype.add("Forest"); // G diff --git a/Mage.Sets/src/mage/cards/s/SnowCoveredIsland.java b/Mage.Sets/src/mage/cards/s/SnowCoveredIsland.java index ceac2b78b2e..97738181d68 100644 --- a/Mage.Sets/src/mage/cards/s/SnowCoveredIsland.java +++ b/Mage.Sets/src/mage/cards/s/SnowCoveredIsland.java @@ -32,6 +32,7 @@ import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -41,8 +42,8 @@ public class SnowCoveredIsland extends CardImpl { public SnowCoveredIsland(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Basic"); - this.supertype.add("Snow"); + this.addSuperType(SuperType.BASIC); + this.addSuperType(SuperType.SNOW); this.subtype.add("Island"); // U diff --git a/Mage.Sets/src/mage/cards/s/SnowCoveredMountain.java b/Mage.Sets/src/mage/cards/s/SnowCoveredMountain.java index 24a2afeac5d..d8566e3e119 100644 --- a/Mage.Sets/src/mage/cards/s/SnowCoveredMountain.java +++ b/Mage.Sets/src/mage/cards/s/SnowCoveredMountain.java @@ -32,6 +32,7 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -41,8 +42,8 @@ public class SnowCoveredMountain extends CardImpl { public SnowCoveredMountain(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Basic"); - this.supertype.add("Snow"); + this.addSuperType(SuperType.BASIC); + this.addSuperType(SuperType.SNOW); this.subtype.add("Mountain"); // R diff --git a/Mage.Sets/src/mage/cards/s/SnowCoveredPlains.java b/Mage.Sets/src/mage/cards/s/SnowCoveredPlains.java index 3f7f5aa045b..a49950c30fe 100644 --- a/Mage.Sets/src/mage/cards/s/SnowCoveredPlains.java +++ b/Mage.Sets/src/mage/cards/s/SnowCoveredPlains.java @@ -32,6 +32,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -41,8 +42,8 @@ public class SnowCoveredPlains extends CardImpl { public SnowCoveredPlains(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Basic"); - this.supertype.add("Snow"); + addSuperType(SuperType.BASIC); + addSuperType(SuperType.SNOW); this.subtype.add("Plains"); // W diff --git a/Mage.Sets/src/mage/cards/s/SnowCoveredSwamp.java b/Mage.Sets/src/mage/cards/s/SnowCoveredSwamp.java index 5dc1e6d9e58..34cf1530392 100644 --- a/Mage.Sets/src/mage/cards/s/SnowCoveredSwamp.java +++ b/Mage.Sets/src/mage/cards/s/SnowCoveredSwamp.java @@ -32,6 +32,7 @@ import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -41,8 +42,8 @@ public class SnowCoveredSwamp extends CardImpl { public SnowCoveredSwamp(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Basic"); - this.supertype.add("Snow"); + this.addSuperType(SuperType.BASIC); + this.addSuperType(SuperType.SNOW); this.subtype.add("Swamp"); // B diff --git a/Mage.Sets/src/mage/cards/s/SolkanarTheSwampKing.java b/Mage.Sets/src/mage/cards/s/SolkanarTheSwampKing.java index b6142ccddd2..4e524addcba 100644 --- a/Mage.Sets/src/mage/cards/s/SolkanarTheSwampKing.java +++ b/Mage.Sets/src/mage/cards/s/SolkanarTheSwampKing.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.GainLifeEffect; @@ -35,12 +34,15 @@ import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; +import java.util.UUID; + /** * * @author Loki @@ -49,7 +51,7 @@ public class SolkanarTheSwampKing extends CardImpl { public SolkanarTheSwampKing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java b/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java index 305c5ea68b7..e9ab370de76 100644 --- a/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java +++ b/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,10 +42,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +57,7 @@ public class SoramaroFirstToDream extends CardImpl { public SoramaroFirstToDream(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java b/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java index 3eae4085595..c4c8b0279c0 100644 --- a/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java +++ b/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,6 +50,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX @@ -64,7 +66,7 @@ public class SosukeSonOfSeshiro extends CardImpl { public SosukeSonOfSeshiro(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Snake"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java b/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java index d5beade5767..29f2174fbd7 100644 --- a/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java +++ b/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java @@ -37,10 +37,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.DamagedPlayerThisTurnPredicate; import mage.target.Target; @@ -59,7 +56,7 @@ public class SpearOfHeliod extends CardImpl { public SpearOfHeliod(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.ARTIFACT},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Creatures you control get +1/+1. diff --git a/Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java b/Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java index e186413d9d0..178f70d68ba 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java +++ b/Mage.Sets/src/mage/cards/s/SpiritOfTheNight.java @@ -27,19 +27,20 @@ */ package mage.cards.s; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.SourceAttackingCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import java.util.UUID; -import mage.abilities.condition.common.SourceAttackingCondition; /** * @@ -49,7 +50,7 @@ public class SpiritOfTheNight extends CardImpl { public SpiritOfTheNight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/s/SquallDrifter.java b/Mage.Sets/src/mage/cards/s/SquallDrifter.java index 8ddf51f0429..927166ca7f3 100644 --- a/Mage.Sets/src/mage/cards/s/SquallDrifter.java +++ b/Mage.Sets/src/mage/cards/s/SquallDrifter.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -49,7 +50,7 @@ public class SquallDrifter extends CardImpl { public SquallDrifter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.supertype.add("Snow"); + this.addSuperType(SuperType.SNOW); this.subtype.add("Elemental"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/s/SqueeGoblinNabob.java b/Mage.Sets/src/mage/cards/s/SqueeGoblinNabob.java index bd412857ac6..eb3efdc28a7 100644 --- a/Mage.Sets/src/mage/cards/s/SqueeGoblinNabob.java +++ b/Mage.Sets/src/mage/cards/s/SqueeGoblinNabob.java @@ -27,16 +27,18 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -45,7 +47,7 @@ public class SqueeGoblinNabob extends CardImpl { public SqueeGoblinNabob(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/s/SramSeniorEdificer.java b/Mage.Sets/src/mage/cards/s/SramSeniorEdificer.java index f3bfeb7e513..927f94f6dae 100644 --- a/Mage.Sets/src/mage/cards/s/SramSeniorEdificer.java +++ b/Mage.Sets/src/mage/cards/s/SramSeniorEdificer.java @@ -27,17 +27,19 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -55,7 +57,7 @@ public class SramSeniorEdificer extends CardImpl { public SramSeniorEdificer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dwarf"); this.subtype.add("Advisor"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/StarkeOfRath.java b/Mage.Sets/src/mage/cards/s/StarkeOfRath.java index cb19ef433ee..6e76ad65bbd 100644 --- a/Mage.Sets/src/mage/cards/s/StarkeOfRath.java +++ b/Mage.Sets/src/mage/cards/s/StarkeOfRath.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -38,12 +37,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -53,6 +47,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -69,7 +65,7 @@ public class StarkeOfRath extends CardImpl { public StarkeOfRath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java index 49f300955a1..30f71c35eed 100644 --- a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java +++ b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -35,13 +34,10 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -49,6 +45,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +55,7 @@ public class StitcherGeralf extends CardImpl { public StitcherGeralf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/s/StonebrowKrosanHero.java b/Mage.Sets/src/mage/cards/s/StonebrowKrosanHero.java index f2c8eb2fd86..5a2c69735a8 100644 --- a/Mage.Sets/src/mage/cards/s/StonebrowKrosanHero.java +++ b/Mage.Sets/src/mage/cards/s/StonebrowKrosanHero.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; import mage.abilities.effects.Effect; @@ -37,9 +36,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author emerald000 @@ -53,7 +55,7 @@ public class StonebrowKrosanHero extends CardImpl { public StonebrowKrosanHero(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Centaur"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/s/StudentOfElements.java b/Mage.Sets/src/mage/cards/s/StudentOfElements.java index e135e736755..db8478658cb 100644 --- a/Mage.Sets/src/mage/cards/s/StudentOfElements.java +++ b/Mage.Sets/src/mage/cards/s/StudentOfElements.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -110,7 +111,7 @@ class TobitaMasterOfWinds extends Token { TobitaMasterOfWinds() { super("Tobita, Master of Winds", ""); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add("Human"); diff --git a/Mage.Sets/src/mage/cards/s/SunCeYoungConquerer.java b/Mage.Sets/src/mage/cards/s/SunCeYoungConquerer.java index 859cfd3410c..7e685e7b5cd 100644 --- a/Mage.Sets/src/mage/cards/s/SunCeYoungConquerer.java +++ b/Mage.Sets/src/mage/cards/s/SunCeYoungConquerer.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.target.common.TargetCreaturePermanent; /** @@ -46,7 +47,7 @@ public class SunCeYoungConquerer extends CardImpl { public SunCeYoungConquerer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java b/Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java index fe52cac8571..a30e27c2d7b 100644 --- a/Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java +++ b/Mage.Sets/src/mage/cards/s/SunQuanLordOfWu.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -47,7 +48,7 @@ public class SunQuanLordOfWu extends CardImpl { public SunQuanLordOfWu(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/s/SunastianFalconer.java b/Mage.Sets/src/mage/cards/s/SunastianFalconer.java index a9dc24417ef..4ca462c0f10 100644 --- a/Mage.Sets/src/mage/cards/s/SunastianFalconer.java +++ b/Mage.Sets/src/mage/cards/s/SunastianFalconer.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.costs.common.TapSourceCost; @@ -35,8 +34,11 @@ import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LoneFox @@ -45,7 +47,7 @@ public class SunastianFalconer extends CardImpl { public SunastianFalconer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Shaman"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java b/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java index 081dcfccaad..44624f9af52 100644 --- a/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java +++ b/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CantBeCounteredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -39,11 +38,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +61,7 @@ public class SurrakDragonclaw extends CardImpl { public SurrakDragonclaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/s/SurrakTheHuntCaller.java b/Mage.Sets/src/mage/cards/s/SurrakTheHuntCaller.java index 177509decd3..c2adcf16d39 100644 --- a/Mage.Sets/src/mage/cards/s/SurrakTheHuntCaller.java +++ b/Mage.Sets/src/mage/cards/s/SurrakTheHuntCaller.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -39,9 +38,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -50,7 +52,7 @@ public class SurrakTheHuntCaller extends CardImpl { public SurrakTheHuntCaller(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/s/SwordOfKaldra.java b/Mage.Sets/src/mage/cards/s/SwordOfKaldra.java index 785c5dac5db..283e08cc901 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfKaldra.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfKaldra.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,16 +36,15 @@ 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.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +53,7 @@ public class SwordOfKaldra extends CardImpl { public SwordOfKaldra(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature gets +5/+5. diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java b/Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java index 291caa92e0f..78d855dca08 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheAnimist.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; @@ -51,7 +52,7 @@ public class SwordOfTheAnimist extends CardImpl { public SwordOfTheAnimist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java b/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java index bcad9db503a..e819825b9a0 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -36,11 +35,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -55,7 +57,7 @@ public class SwordOfTheChosen extends CardImpl { public SwordOfTheChosen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Target legendary creature gets +2/+2 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java index b2e25afafce..845841fc764 100644 --- a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java +++ b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,12 +38,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; @@ -53,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -69,7 +65,7 @@ public class SydriGalvanicGenius extends CardImpl { public SydriGalvanicGenius(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Artificer"); diff --git a/Mage.Sets/src/mage/cards/s/SyggRiverCutthroat.java b/Mage.Sets/src/mage/cards/s/SyggRiverCutthroat.java index acade927aea..a13834053d9 100644 --- a/Mage.Sets/src/mage/cards/s/SyggRiverCutthroat.java +++ b/Mage.Sets/src/mage/cards/s/SyggRiverCutthroat.java @@ -27,10 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; @@ -38,7 +34,12 @@ import mage.abilities.condition.common.OpponentLostLifeCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; +import mage.constants.Zone; + +import java.util.UUID; /** * @@ -48,7 +49,7 @@ public class SyggRiverCutthroat extends CardImpl { public SyggRiverCutthroat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U/B}{U/B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java b/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java index 0d56835f4da..0212163687f 100644 --- a/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java +++ b/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,12 +37,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +60,7 @@ public class SyggRiverGuide extends CardImpl { public SyggRiverGuide(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java b/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java index 9ce46cab504..aa309822c62 100644 --- a/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java +++ b/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,10 +34,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.DamagePlayerEvent; @@ -46,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -55,7 +53,7 @@ public class SzadekLordOfSecrets extends CardImpl { public SzadekLordOfSecrets(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java b/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java index 1839cc5487e..b1b527b26bc 100644 --- a/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java +++ b/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,9 +37,12 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -49,7 +51,7 @@ public class TahngarthTalruumHero extends CardImpl { public TahngarthTalruumHero(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Minotaur"); this.subtype.add("Warrior"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/t/TajicBladeOfTheLegion.java b/Mage.Sets/src/mage/cards/t/TajicBladeOfTheLegion.java index f436f26aafb..05823de0b4d 100644 --- a/Mage.Sets/src/mage/cards/t/TajicBladeOfTheLegion.java +++ b/Mage.Sets/src/mage/cards/t/TajicBladeOfTheLegion.java @@ -27,15 +27,17 @@ */ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.MageInt; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.BattalionAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -45,7 +47,7 @@ public class TajicBladeOfTheLegion extends CardImpl { public TajicBladeOfTheLegion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java b/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java index 5dae2003200..c42e81577de 100644 --- a/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java +++ b/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java @@ -52,7 +52,7 @@ public class TakenoSamuraiGeneral extends CardImpl { public TakenoSamuraiGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java b/Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java index 17fdd128ad0..9d251f8f262 100644 --- a/Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java +++ b/Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java @@ -34,6 +34,7 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -55,7 +56,7 @@ public class TalrandSkySummoner extends CardImpl { public TalrandSkySummoner(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java index 74e97374fee..f6b025f8f6b 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java +++ b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.abilities.effects.keyword.InvestigateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; @@ -45,6 +45,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -59,7 +61,7 @@ public class TamiyosJournal extends CardImpl { public TamiyosJournal(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // At the beginning of your upkeep, investigate (Create a colorless Clue artifact token with \"{2}, Sacrifice this artifact: Draw a card.\"). this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new InvestigateEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/cards/t/TanaTheBloodsower.java b/Mage.Sets/src/mage/cards/t/TanaTheBloodsower.java index 26f875a7ca3..c9a10e1433b 100644 --- a/Mage.Sets/src/mage/cards/t/TanaTheBloodsower.java +++ b/Mage.Sets/src/mage/cards/t/TanaTheBloodsower.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -39,10 +38,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.token.SaprolingToken; import mage.players.Player; +import java.util.UUID; + /** * * @author spjspj @@ -52,7 +54,7 @@ public class TanaTheBloodsower extends CardImpl { public TanaTheBloodsower(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Druid"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/t/Taniwha.java b/Mage.Sets/src/mage/cards/t/Taniwha.java index e5446c716ad..2ab177bec71 100644 --- a/Mage.Sets/src/mage/cards/t/Taniwha.java +++ b/Mage.Sets/src/mage/cards/t/Taniwha.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,12 +37,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes @@ -52,7 +54,7 @@ public class Taniwha extends CardImpl { public Taniwha(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Serpent"); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java b/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java index e5f1886ef80..daced1521de 100644 --- a/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java +++ b/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -35,19 +34,18 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +54,7 @@ public class TarielReckonerOfSouls extends CardImpl { public TarielReckonerOfSouls(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Angel"); this.power = new MageInt(4); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/t/TaroxBladewing.java b/Mage.Sets/src/mage/cards/t/TaroxBladewing.java index 299db58fc85..b855e1c9103 100644 --- a/Mage.Sets/src/mage/cards/t/TaroxBladewing.java +++ b/Mage.Sets/src/mage/cards/t/TaroxBladewing.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.GrandeurAbility; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; @@ -38,6 +37,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -47,7 +49,7 @@ public class TaroxBladewing extends CardImpl { public TaroxBladewing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java b/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java index 6de60b178ef..c15f5ca5d66 100644 --- a/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java +++ b/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterNonlandCard; import mage.filter.predicate.other.OwnerIdPredicate; @@ -49,6 +49,8 @@ import mage.target.Target; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +59,7 @@ public class TasigurTheGoldenFang extends CardImpl { public TasigurTheGoldenFang(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Shaman"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/t/TatsumasaTheDragonsFang.java b/Mage.Sets/src/mage/cards/t/TatsumasaTheDragonsFang.java index 90758ebf672..f4df6dc7da7 100644 --- a/Mage.Sets/src/mage/cards/t/TatsumasaTheDragonsFang.java +++ b/Mage.Sets/src/mage/cards/t/TatsumasaTheDragonsFang.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -44,10 +43,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -56,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +62,7 @@ public class TatsumasaTheDragonsFang extends CardImpl { public TatsumasaTheDragonsFang(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature gets +5/+5. diff --git a/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java b/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java index 5749d00991e..4c2d884ab37 100644 --- a/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java +++ b/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -38,16 +37,13 @@ import mage.abilities.keyword.FlashAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +52,7 @@ public class TeferiMageOfZhalfir extends CardImpl { public TeferiMageOfZhalfir(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/t/TeferisIsle.java b/Mage.Sets/src/mage/cards/t/TeferisIsle.java index 3ba8b5ff9c8..dd6c37c2d7e 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisIsle.java +++ b/Mage.Sets/src/mage/cards/t/TeferisIsle.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.Mana; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -36,8 +35,11 @@ import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author LevelX2 @@ -46,7 +48,7 @@ public class TeferisIsle extends CardImpl { public TeferisIsle(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Phasing this.addAbility(PhasingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/t/TeferisRealm.java b/Mage.Sets/src/mage/cards/t/TeferisRealm.java index c72e6b481da..eb3d2c2cd04 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisRealm.java +++ b/Mage.Sets/src/mage/cards/t/TeferisRealm.java @@ -38,6 +38,7 @@ import mage.choices.Choice; import mage.choices.ChoiceImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -56,7 +57,7 @@ public class TeferisRealm extends CardImpl { public TeferisRealm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}{U}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // At the beginning of each player's upkeep, that player chooses artifact, creature, land, or non-Aura enchantment. All nontoken permanents of that type phase out. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new TeferisRealmEffect(), TargetController.ANY, false)); diff --git a/Mage.Sets/src/mage/cards/t/TenebTheHarvester.java b/Mage.Sets/src/mage/cards/t/TenebTheHarvester.java index 7841a13582e..8c42c31f6ca 100644 --- a/Mage.Sets/src/mage/cards/t/TenebTheHarvester.java +++ b/Mage.Sets/src/mage/cards/t/TenebTheHarvester.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -38,10 +37,13 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreatureCard; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -50,7 +52,7 @@ public class TenebTheHarvester extends CardImpl { public TenebTheHarvester(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java b/Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java index 7017f7aacd7..de02c405e2b 100644 --- a/Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java +++ b/Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java @@ -29,11 +29,6 @@ */ package mage.cards.t; -import java.util.UUID; - -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Zone; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.AttachedToMatchesFilterCondition; @@ -45,12 +40,14 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.Outcome; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX @@ -71,7 +68,7 @@ public class TenzaGodosMaul extends CardImpl { public TenzaGodosMaul(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java index 0c2695b330f..93e8f4fc699 100644 --- a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java +++ b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,10 +37,7 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.BlockingPredicate; @@ -52,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.game.stack.StackObject; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author JRHerlehy @@ -68,7 +66,7 @@ public class TetsuoUmezawa extends CardImpl { public TetsuoUmezawa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Archer"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/t/TeysaEnvoyOfGhosts.java b/Mage.Sets/src/mage/cards/t/TeysaEnvoyOfGhosts.java index 7b7d4aecd2e..0edc6e2cb9a 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaEnvoyOfGhosts.java +++ b/Mage.Sets/src/mage/cards/t/TeysaEnvoyOfGhosts.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,6 +37,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -47,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +57,7 @@ public class TeysaEnvoyOfGhosts extends CardImpl { public TeysaEnvoyOfGhosts(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java index 5e72e843d2c..72267755b4a 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java +++ b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -67,7 +68,7 @@ public class TeysaOrzhovScion extends CardImpl { public TeysaOrzhovScion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java b/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java index c9a9bf02f67..1da1ef37c6b 100644 --- a/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java +++ b/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -39,17 +38,15 @@ import mage.abilities.keyword.IslandwalkAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactCard; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -58,7 +55,7 @@ public class ThadaAdelAcquisitor extends CardImpl { public ThadaAdelAcquisitor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java b/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java index 8651c179d16..05cc8d63102 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java +++ b/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -38,14 +37,12 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author BetaSteward @@ -54,7 +51,7 @@ public class ThaliaGuardianOfThraben extends CardImpl { public ThaliaGuardianOfThraben(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/t/ThaliaHereticCathar.java b/Mage.Sets/src/mage/cards/t/ThaliaHereticCathar.java index 1dfcdcc0df0..847f42b8ab3 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliaHereticCathar.java +++ b/Mage.Sets/src/mage/cards/t/ThaliaHereticCathar.java @@ -35,10 +35,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -52,7 +49,7 @@ public class ThaliaHereticCathar extends CardImpl { public ThaliaHereticCathar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); @@ -105,7 +102,7 @@ class ThaliaTapEffect extends ReplacementEffectImpl { if (game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) { Permanent permanent = ((EntersTheBattlefieldEvent) event).getTarget(); if (permanent != null && (permanent.isCreature() || - (permanent.isLand() && !permanent.getSupertype().contains("Basic")))) { + (permanent.isLand() && !permanent.isBasic()))) { return true; } } diff --git a/Mage.Sets/src/mage/cards/t/ThaliasLancers.java b/Mage.Sets/src/mage/cards/t/ThaliasLancers.java index e7ec4b8343d..53a6c64fee7 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliasLancers.java +++ b/Mage.Sets/src/mage/cards/t/ThaliasLancers.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -49,7 +50,7 @@ public class ThaliasLancers extends CardImpl { private static final FilterCard filter = new FilterCard("legendary card"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public ThaliasLancers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThassaGodOfTheSea.java b/Mage.Sets/src/mage/cards/t/ThassaGodOfTheSea.java index 54827573cff..0117da13155 100644 --- a/Mage.Sets/src/mage/cards/t/ThassaGodOfTheSea.java +++ b/Mage.Sets/src/mage/cards/t/ThassaGodOfTheSea.java @@ -28,7 +28,6 @@ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,18 +37,16 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.DevotionCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; -import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continuous.LoseCreatureTypeSourceEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +56,7 @@ public class ThassaGodOfTheSea extends CardImpl { public ThassaGodOfTheSea(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{2}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java index b0462c585fc..23fdf108de9 100644 --- a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java @@ -27,9 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +38,9 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; @@ -48,6 +48,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** @@ -66,7 +68,7 @@ public class ThatWhichWasTaken extends CardImpl { public ThatWhichWasTaken(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {4}, {T}: Put a divinity counter on target permanent other than That Which Was Taken. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4)); diff --git a/Mage.Sets/src/mage/cards/t/TheAbyss.java b/Mage.Sets/src/mage/cards/t/TheAbyss.java index c89a472c2b5..741e5054b82 100644 --- a/Mage.Sets/src/mage/cards/t/TheAbyss.java +++ b/Mage.Sets/src/mage/cards/t/TheAbyss.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -52,7 +53,7 @@ public class TheAbyss extends CardImpl { public TheAbyss(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}"); - this.supertype.add("World"); + addSuperType(SuperType.WORLD); // At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of his or her choice. It can't be regenerated. this.addAbility(new TheAbyssTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TheChainVeil.java b/Mage.Sets/src/mage/cards/t/TheChainVeil.java index cd2e2a08d15..e88302184de 100644 --- a/Mage.Sets/src/mage/cards/t/TheChainVeil.java +++ b/Mage.Sets/src/mage/cards/t/TheChainVeil.java @@ -27,9 +27,6 @@ */ package mage.cards.t; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -41,20 +38,17 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.TargetController; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.StackObject; import mage.players.Player; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -63,7 +57,7 @@ public class TheChainVeil extends CardImpl { public TheChainVeil(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life. this.addAbility(new BeginningOfEndStepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/t/TheDeathStar.java b/Mage.Sets/src/mage/cards/t/TheDeathStar.java index a0f4e157379..e61d0eb37ae 100644 --- a/Mage.Sets/src/mage/cards/t/TheDeathStar.java +++ b/Mage.Sets/src/mage/cards/t/TheDeathStar.java @@ -41,6 +41,7 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.TargetPermanent; @@ -54,7 +55,7 @@ public class TheDeathStar extends CardImpl { public TheDeathStar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java b/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java index 96823e0cc6c..69d32e78959 100644 --- a/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java +++ b/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java @@ -27,9 +27,6 @@ */ package mage.cards.t; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,16 +39,16 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeGroupEvent; import mage.target.common.TargetControlledPermanent; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +57,7 @@ public class TheGitrogMonster extends CardImpl { public TheGitrogMonster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Frog"); this.subtype.add("Horror"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/t/TheLadyOfTheMountain.java b/Mage.Sets/src/mage/cards/t/TheLadyOfTheMountain.java index d1e34766247..bf719b92f72 100644 --- a/Mage.Sets/src/mage/cards/t/TheLadyOfTheMountain.java +++ b/Mage.Sets/src/mage/cards/t/TheLadyOfTheMountain.java @@ -27,11 +27,13 @@ */ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class TheLadyOfTheMountain extends CardImpl { public TheLadyOfTheMountain(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Giant"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/t/TheMimeoplasm.java b/Mage.Sets/src/mage/cards/t/TheMimeoplasm.java index 58bac081731..fc9d2d8a78e 100644 --- a/Mage.Sets/src/mage/cards/t/TheMimeoplasm.java +++ b/Mage.Sets/src/mage/cards/t/TheMimeoplasm.java @@ -27,22 +27,14 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CopyEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.cards.*; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -50,6 +42,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author emerald000 @@ -58,7 +52,7 @@ public class TheMimeoplasm extends CardImpl { public TheMimeoplasm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ooze"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/t/TheTabernacleAtPendrellVale.java b/Mage.Sets/src/mage/cards/t/TheTabernacleAtPendrellVale.java index 07dd69ea823..a4493efd799 100644 --- a/Mage.Sets/src/mage/cards/t/TheTabernacleAtPendrellVale.java +++ b/Mage.Sets/src/mage/cards/t/TheTabernacleAtPendrellVale.java @@ -53,7 +53,7 @@ public class TheTabernacleAtPendrellVale extends CardImpl { public TheTabernacleAtPendrellVale(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // All creatures have "At the beginning of your upkeep, destroy this creature unless you pay {1}." Ability ability = new BeginningOfUpkeepTriggeredAbility(new DestroySourceUnlessPaysEffect(new ManaCostsImpl("{1}")), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/cards/t/TheUnspeakable.java b/Mage.Sets/src/mage/cards/t/TheUnspeakable.java index 890daf6fb8f..93b61d00b12 100644 --- a/Mage.Sets/src/mage/cards/t/TheUnspeakable.java +++ b/Mage.Sets/src/mage/cards/t/TheUnspeakable.java @@ -27,8 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -37,10 +35,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki @@ -55,7 +57,7 @@ public class TheUnspeakable extends CardImpl { public TheUnspeakable(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{U}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java index b848ab785d6..aa80073046d 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java +++ b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,12 +37,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; @@ -53,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInASingleGraveyard; +import java.util.UUID; + /** * * @author emerald000 @@ -68,7 +64,7 @@ public class ThelonOfHavenwood extends CardImpl { public ThelonOfHavenwood(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Druid"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/t/Thermokarst.java b/Mage.Sets/src/mage/cards/t/Thermokarst.java index 892921e0bd4..25e2ca73e62 100644 --- a/Mage.Sets/src/mage/cards/t/Thermokarst.java +++ b/Mage.Sets/src/mage/cards/t/Thermokarst.java @@ -85,7 +85,7 @@ class ThermokarstEffect extends OneShotEffect { Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null && controller != null) { permanent.destroy(source.getSourceId(), game, false); - if (permanent.getSupertype().contains("Snow")) { + if (permanent.isSnow()) { controller.gainLife(1, game); } return true; diff --git a/Mage.Sets/src/mage/cards/t/Thermopod.java b/Mage.Sets/src/mage/cards/t/Thermopod.java index f215321c2a3..a2f883ba9ca 100644 --- a/Mage.Sets/src/mage/cards/t/Thermopod.java +++ b/Mage.Sets/src/mage/cards/t/Thermopod.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.common.SimpleActivatedAbility; @@ -40,10 +39,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -52,7 +54,7 @@ public class Thermopod extends CardImpl { public Thermopod(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Slug"); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/t/ThrasiosTritonHero.java b/Mage.Sets/src/mage/cards/t/ThrasiosTritonHero.java index 15c0a0eecd2..f18953e906a 100644 --- a/Mage.Sets/src/mage/cards/t/ThrasiosTritonHero.java +++ b/Mage.Sets/src/mage/cards/t/ThrasiosTritonHero.java @@ -41,6 +41,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -56,7 +57,7 @@ public class ThrasiosTritonHero extends CardImpl { public ThrasiosTritonHero(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Merfolk"); this.subtype.add("Wizard"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/t/Thraximundar.java b/Mage.Sets/src/mage/cards/t/Thraximundar.java index bc383739301..a2bf96e638b 100644 --- a/Mage.Sets/src/mage/cards/t/Thraximundar.java +++ b/Mage.Sets/src/mage/cards/t/Thraximundar.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; @@ -38,6 +37,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; @@ -47,6 +47,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -55,7 +57,7 @@ public class Thraximundar extends CardImpl { public Thraximundar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Assassin"); diff --git a/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java b/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java index 1694fd2db99..f2ddb82a07b 100644 --- a/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java +++ b/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java @@ -27,10 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,8 +34,14 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 @@ -48,7 +50,7 @@ public class ThrissNantukoPrimus extends CardImpl { public ThrissNantukoPrimus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Insect"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/cards/t/ThromokTheInsatiable.java b/Mage.Sets/src/mage/cards/t/ThromokTheInsatiable.java index 44359af8d68..b567dc372c2 100644 --- a/Mage.Sets/src/mage/cards/t/ThromokTheInsatiable.java +++ b/Mage.Sets/src/mage/cards/t/ThromokTheInsatiable.java @@ -27,13 +27,15 @@ */ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.effects.common.DevourEffect.DevourFactor; import mage.abilities.keyword.DevourAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class ThromokTheInsatiable extends CardImpl { public ThromokTheInsatiable(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Hellion"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/t/ThrummingStone.java b/Mage.Sets/src/mage/cards/t/ThrummingStone.java index 7c1ba939885..0bea910ed05 100644 --- a/Mage.Sets/src/mage/cards/t/ThrummingStone.java +++ b/Mage.Sets/src/mage/cards/t/ThrummingStone.java @@ -28,15 +28,16 @@ package mage.cards.t; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.continuous.GainAbilityControlledSpellsEffect; import mage.abilities.keyword.RippleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterSpell; import java.util.UUID; -import mage.abilities.effects.common.continuous.GainAbilityControlledSpellsEffect; /** * @author klayhamn @@ -45,7 +46,7 @@ public class ThrummingStone extends CardImpl { public ThrummingStone(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // spells you cast have Ripple 4 this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(new RippleAbility(4), new FilterSpell("spells")))); diff --git a/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java b/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java index 25a04fa913b..633da59a96b 100644 --- a/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java +++ b/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java @@ -27,10 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -40,6 +36,11 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; +import mage.constants.Zone; + +import java.util.UUID; /** * @@ -49,7 +50,7 @@ public class ThrunTheLastTroll extends CardImpl { public ThrunTheLastTroll(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Troll"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/t/TiborAndLumia.java b/Mage.Sets/src/mage/cards/t/TiborAndLumia.java index 9b4d0af9b85..84f4d9673d0 100644 --- a/Mage.Sets/src/mage/cards/t/TiborAndLumia.java +++ b/Mage.Sets/src/mage/cards/t/TiborAndLumia.java @@ -27,9 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,7 +36,9 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -65,7 +66,7 @@ public class TiborAndLumia extends CardImpl { public TiborAndLumia(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java b/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java index bc513652d0f..861d3ae86ed 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java +++ b/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,6 +37,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterLandPermanent; @@ -45,6 +45,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.Token; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +61,7 @@ public class TitaniaProtectorOfArgoth extends CardImpl { public TitaniaProtectorOfArgoth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elemental"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/t/TivadarOfThorn.java b/Mage.Sets/src/mage/cards/t/TivadarOfThorn.java index ced2ba97560..aec7dae19cd 100644 --- a/Mage.Sets/src/mage/cards/t/TivadarOfThorn.java +++ b/Mage.Sets/src/mage/cards/t/TivadarOfThorn.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,11 +37,14 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -57,7 +59,7 @@ public class TivadarOfThorn extends CardImpl { public TivadarOfThorn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Knight"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/t/TobiasAndrion.java b/Mage.Sets/src/mage/cards/t/TobiasAndrion.java index d4252bab1f7..739e2950c01 100644 --- a/Mage.Sets/src/mage/cards/t/TobiasAndrion.java +++ b/Mage.Sets/src/mage/cards/t/TobiasAndrion.java @@ -32,6 +32,7 @@ import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; /** * @@ -41,7 +42,7 @@ public class TobiasAndrion extends CardImpl { public TobiasAndrion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/t/TolarianAcademy.java b/Mage.Sets/src/mage/cards/t/TolarianAcademy.java index 95578acb0d2..42f6508aadf 100644 --- a/Mage.Sets/src/mage/cards/t/TolarianAcademy.java +++ b/Mage.Sets/src/mage/cards/t/TolarianAcademy.java @@ -28,16 +28,18 @@ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; import mage.Mana; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import java.util.UUID; + /** * * @author Backfir3 @@ -53,7 +55,7 @@ public class TolarianAcademy extends CardImpl { public TolarianAcademy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); DynamicManaAbility ability = new DynamicManaAbility(Mana.BlueMana(1), new PermanentsOnBattlefieldCount(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java index 1c2032fa86c..ab3783ebd86 100644 --- a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleActivatedAbility; @@ -37,15 +36,14 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author Plopman @@ -64,7 +62,7 @@ public class TolsimirWolfblood extends CardImpl { public TolsimirWolfblood(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Warrior"); @@ -94,7 +92,7 @@ class VojaToken extends Token { public VojaToken() { super("Voja", "legendary 2/2 green and white Wolf creature token named Voja"); this.cardType.add(CardType.CREATURE); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Wolf"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/cards/t/TombOfUrami.java b/Mage.Sets/src/mage/cards/t/TombOfUrami.java index f4fb189b9b0..2d564d52c0a 100644 --- a/Mage.Sets/src/mage/cards/t/TombOfUrami.java +++ b/Mage.Sets/src/mage/cards/t/TombOfUrami.java @@ -42,6 +42,7 @@ import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; @@ -56,7 +57,7 @@ public class TombOfUrami extends CardImpl { public TombOfUrami(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); // {tap}: Add {B} to your mana pool. Tomb of Urami deals 1 damage to you if you don't control an Ogre. Ability ability = new BlackManaAbility(); @@ -121,7 +122,7 @@ class UramiToken extends Token { cardType.add(CardType.CREATURE); subtype.add("Demon"); subtype.add("Spirit"); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); color.setBlack(true); power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java b/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java index 075eb9e4a8b..e553b2f63c0 100644 --- a/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java +++ b/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -36,14 +35,13 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author LevelX2 @@ -52,7 +50,7 @@ public class TomorrowAzamisFamiliar extends CardImpl { public TomorrowAzamisFamiliar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/t/TorWauki.java b/Mage.Sets/src/mage/cards/t/TorWauki.java index 90c4c8764ca..c3d321c2bc4 100644 --- a/Mage.Sets/src/mage/cards/t/TorWauki.java +++ b/Mage.Sets/src/mage/cards/t/TorWauki.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -36,9 +35,12 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; +import java.util.UUID; + /** * * @author LoneFox @@ -47,7 +49,7 @@ public class TorWauki extends CardImpl { public TorWauki(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Archer"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/t/TorstenVonUrsus.java b/Mage.Sets/src/mage/cards/t/TorstenVonUrsus.java index aa16344f2e9..e52ae9169f5 100644 --- a/Mage.Sets/src/mage/cards/t/TorstenVonUrsus.java +++ b/Mage.Sets/src/mage/cards/t/TorstenVonUrsus.java @@ -27,11 +27,13 @@ */ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -41,7 +43,7 @@ public class TorstenVonUrsus extends CardImpl { public TorstenVonUrsus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/cards/t/ToshiroUmezawa.java b/Mage.Sets/src/mage/cards/t/ToshiroUmezawa.java index 6f2c8a0ff0e..24fae5654b0 100644 --- a/Mage.Sets/src/mage/cards/t/ToshiroUmezawa.java +++ b/Mage.Sets/src/mage/cards/t/ToshiroUmezawa.java @@ -29,10 +29,7 @@ package mage.cards.t; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -42,7 +39,6 @@ import mage.abilities.keyword.BushidoAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -71,7 +67,7 @@ public class ToshiroUmezawa extends CardImpl { public ToshiroUmezawa(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Samurai"); diff --git a/Mage.Sets/src/mage/cards/t/TresserhornSinks.java b/Mage.Sets/src/mage/cards/t/TresserhornSinks.java index 0fee1fd498c..1c908a33a12 100644 --- a/Mage.Sets/src/mage/cards/t/TresserhornSinks.java +++ b/Mage.Sets/src/mage/cards/t/TresserhornSinks.java @@ -35,6 +35,7 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -44,7 +45,7 @@ public class TresserhornSinks extends CardImpl { public TresserhornSinks(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Snow"); + this.addSuperType(SuperType.SNOW); // Tresserhorn Sinks enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java b/Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java index 47c21120b54..549682d312a 100644 --- a/Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java +++ b/Mage.Sets/src/mage/cards/t/TrevaTheRenewer.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,11 +40,14 @@ import mage.cards.CardSetInfo; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author fireshoes @@ -54,7 +56,7 @@ public class TrevaTheRenewer extends CardImpl { public TrevaTheRenewer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/t/TriadOfFates.java b/Mage.Sets/src/mage/cards/t/TriadOfFates.java index 806a5f862fa..6300761a7e8 100644 --- a/Mage.Sets/src/mage/cards/t/TriadOfFates.java +++ b/Mage.Sets/src/mage/cards/t/TriadOfFates.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -53,6 +53,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -69,7 +71,7 @@ public class TriadOfFates extends CardImpl { public TriadOfFates(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/t/Tromokratis.java b/Mage.Sets/src/mage/cards/t/Tromokratis.java index 1ea1f6b789f..50df2af4849 100644 --- a/Mage.Sets/src/mage/cards/t/Tromokratis.java +++ b/Mage.Sets/src/mage/cards/t/Tromokratis.java @@ -42,10 +42,7 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -61,7 +58,7 @@ public class Tromokratis extends CardImpl { public Tromokratis(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kraken"); this.power = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java b/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java index 77ffbb0d064..a700a0acbd4 100644 --- a/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java +++ b/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java @@ -28,8 +28,6 @@ package mage.cards.t; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -43,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -50,6 +49,9 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +60,7 @@ public class TrostaniSelesnyasVoice extends CardImpl { public TrostaniSelesnyasVoice(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{G}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dryad"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/t/TsaboTavoc.java b/Mage.Sets/src/mage/cards/t/TsaboTavoc.java index 758a2e55c0b..d0f16a65a63 100644 --- a/Mage.Sets/src/mage/cards/t/TsaboTavoc.java +++ b/Mage.Sets/src/mage/cards/t/TsaboTavoc.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,11 +38,14 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +62,7 @@ public class TsaboTavoc extends CardImpl { public TsaboTavoc(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Horror"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java b/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java index 84b03b0eddd..adb4d80893d 100644 --- a/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java +++ b/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,9 +38,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -50,7 +52,7 @@ public class TuknirDeathlock extends CardImpl { public TuknirDeathlock(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{R}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java b/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java index b6210b1a1de..cbee92a6a68 100644 --- a/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java +++ b/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; import mage.game.permanent.token.Token; /** @@ -46,7 +47,7 @@ public class TuktukTheExplorer extends CardImpl { public TuktukTheExplorer (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.power = new MageInt(1); @@ -73,7 +74,7 @@ class TuktukTheReturnedToken extends Token { setOriginalExpansionSetCode(setCode); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); - supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); subtype.add("Goblin"); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java b/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java index 94d28b303cc..915f587fea8 100644 --- a/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java +++ b/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,12 +37,15 @@ import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +59,7 @@ public class TymaretTheMurderKing extends CardImpl { public TymaretTheMurderKing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Zombie"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/t/TymnaTheWeaver.java b/Mage.Sets/src/mage/cards/t/TymnaTheWeaver.java index 5c135c95755..1613562b680 100644 --- a/Mage.Sets/src/mage/cards/t/TymnaTheWeaver.java +++ b/Mage.Sets/src/mage/cards/t/TymnaTheWeaver.java @@ -41,10 +41,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.WatcherScope; +import mage.constants.*; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -61,7 +58,7 @@ public class TymnaTheWeaver extends CardImpl { public TymnaTheWeaver(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Cleric"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/u/UginsNexus.java b/Mage.Sets/src/mage/cards/u/UginsNexus.java index 314f518ce6e..ef3c46735c5 100644 --- a/Mage.Sets/src/mage/cards/u/UginsNexus.java +++ b/Mage.Sets/src/mage/cards/u/UginsNexus.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -35,10 +34,7 @@ import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -46,6 +42,8 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -54,7 +52,7 @@ public class UginsNexus extends CardImpl { public UginsNexus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // If a player would begin an extra turn, that player skips that turn instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UginsNexusSkipExtraTurnsEffect())); diff --git a/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java b/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java index 0c1923cdea8..b0950720b16 100644 --- a/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java +++ b/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; @@ -51,6 +51,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes @@ -59,7 +61,7 @@ public class UlamogTheCeaselessHunger extends CardImpl { public UlamogTheCeaselessHunger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{10}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Eldrazi"); this.power = new MageInt(10); this.toughness = new MageInt(10); diff --git a/Mage.Sets/src/mage/cards/u/UlamogTheInfiniteGyre.java b/Mage.Sets/src/mage/cards/u/UlamogTheInfiniteGyre.java index 0211f2b09de..c21417fc9ef 100644 --- a/Mage.Sets/src/mage/cards/u/UlamogTheInfiniteGyre.java +++ b/Mage.Sets/src/mage/cards/u/UlamogTheInfiniteGyre.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.PutIntoGraveFromAnywhereSourceTriggeredAbility; @@ -39,8 +38,11 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author maurer.it_at_gmail.com @@ -49,7 +51,7 @@ public class UlamogTheInfiniteGyre extends CardImpl { public UlamogTheInfiniteGyre(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{11}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Eldrazi"); this.power = new MageInt(10); diff --git a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java index d2eee0d242f..37500c9404b 100644 --- a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java +++ b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -44,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -55,6 +55,8 @@ import mage.game.permanent.token.SaprolingToken; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author emerald000 @@ -63,7 +65,7 @@ public class UlashtTheHateSeed extends CardImpl { public UlashtTheHateSeed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Hellion"); this.subtype.add("Hydra"); diff --git a/Mage.Sets/src/mage/cards/u/UlrichOfTheKrallenhorde.java b/Mage.Sets/src/mage/cards/u/UlrichOfTheKrallenhorde.java index 96c693c6323..58da11005a1 100644 --- a/Mage.Sets/src/mage/cards/u/UlrichOfTheKrallenhorde.java +++ b/Mage.Sets/src/mage/cards/u/UlrichOfTheKrallenhorde.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -39,15 +38,14 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -56,7 +54,7 @@ public class UlrichOfTheKrallenhorde extends CardImpl { public UlrichOfTheKrallenhorde(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Werewolf"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java b/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java index 5603c1604f9..7b2f5da4f7b 100644 --- a/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java +++ b/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +39,7 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -52,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -60,7 +62,7 @@ public class UlrichUncontestedAlpha extends CardImpl { public UlrichUncontestedAlpha(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Werewolf"); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/u/UmezawasJitte.java b/Mage.Sets/src/mage/cards/u/UmezawasJitte.java index 830f3a2b2b1..26b4acc053e 100644 --- a/Mage.Sets/src/mage/cards/u/UmezawasJitte.java +++ b/Mage.Sets/src/mage/cards/u/UmezawasJitte.java @@ -57,7 +57,7 @@ public class UmezawasJitte extends CardImpl { public UmezawasJitte(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Whenever equipped creature deals combat damage, put two charge counters on Umezawa's Jitte. diff --git a/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java b/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java index c4adbac5ab1..fcef3a127e5 100644 --- a/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java +++ b/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -42,10 +41,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -56,6 +52,8 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -64,7 +62,7 @@ public class UnscytheKillerOfKings extends CardImpl { public UnscytheKillerOfKings(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{U}{B}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature gets +3/+3 and has first strike. diff --git a/Mage.Sets/src/mage/cards/u/UntaidakeTheCloudKeeper.java b/Mage.Sets/src/mage/cards/u/UntaidakeTheCloudKeeper.java index 7293d384c9b..cad94f417b1 100644 --- a/Mage.Sets/src/mage/cards/u/UntaidakeTheCloudKeeper.java +++ b/Mage.Sets/src/mage/cards/u/UntaidakeTheCloudKeeper.java @@ -44,6 +44,7 @@ import mage.abilities.mana.conditional.ManaCondition; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.Game; /** @@ -54,7 +55,7 @@ public class UntaidakeTheCloudKeeper extends CardImpl { public UntaidakeTheCloudKeeper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); // Untaidake, the Cloud Keeper enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); @@ -103,7 +104,7 @@ class LegendaryCastManaCondition extends ManaCondition implements Condition { public boolean apply(Game game, Ability source) { if (source instanceof SpellAbility) { MageObject object = game.getObject(source.getSourceId()); - if (object != null && object.getSupertype().contains("Legendary")) { + if (object != null && object.isLegendary()) { return true; } } diff --git a/Mage.Sets/src/mage/cards/u/UrabraskTheHidden.java b/Mage.Sets/src/mage/cards/u/UrabraskTheHidden.java index 8b57905d742..a7d061fcdbc 100644 --- a/Mage.Sets/src/mage/cards/u/UrabraskTheHidden.java +++ b/Mage.Sets/src/mage/cards/u/UrabraskTheHidden.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -36,10 +35,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; @@ -47,6 +43,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Loki @@ -55,7 +53,7 @@ public class UrabraskTheHidden extends CardImpl { public UrabraskTheHidden(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Praetor"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/u/Urborg.java b/Mage.Sets/src/mage/cards/u/Urborg.java index 5622c38b786..75ae3d69d87 100644 --- a/Mage.Sets/src/mage/cards/u/Urborg.java +++ b/Mage.Sets/src/mage/cards/u/Urborg.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,9 +37,12 @@ import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author anonymous @@ -49,7 +51,7 @@ public class Urborg extends CardImpl { public Urborg(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {B} to your mana pool. this.addAbility(new BlackManaAbility()); diff --git a/Mage.Sets/src/mage/cards/u/UrborgTombOfYawgmoth.java b/Mage.Sets/src/mage/cards/u/UrborgTombOfYawgmoth.java index 5c0818e58c3..946fc3c1078 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgTombOfYawgmoth.java +++ b/Mage.Sets/src/mage/cards/u/UrborgTombOfYawgmoth.java @@ -47,7 +47,7 @@ public class UrborgTombOfYawgmoth extends CardImpl { public UrborgTombOfYawgmoth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Each land is a Swamp in addition to its other land types. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new BlackManaAbility(), Duration.WhileOnBattlefield, new FilterLandPermanent(), diff --git a/Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java b/Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java index 8851e23c4d2..857c0aa7f9e 100644 --- a/Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java +++ b/Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java @@ -27,7 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.AuraAttachedCount; @@ -37,8 +36,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -47,7 +49,7 @@ public class UrilTheMiststalker extends CardImpl { public UrilTheMiststalker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{G}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Beast"); diff --git a/Mage.Sets/src/mage/cards/u/UyoSilentProphet.java b/Mage.Sets/src/mage/cards/u/UyoSilentProphet.java index 397fecf4bbe..62b3693d690 100644 --- a/Mage.Sets/src/mage/cards/u/UyoSilentProphet.java +++ b/Mage.Sets/src/mage/cards/u/UyoSilentProphet.java @@ -27,9 +27,6 @@ */ package mage.cards.u; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,6 +36,8 @@ import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledLandPermanent; @@ -47,6 +46,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki @@ -63,7 +64,7 @@ public class UyoSilentProphet extends CardImpl { public UyoSilentProphet(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Moonfolk"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java b/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java index abf53b73a7b..fbdb85dc97f 100644 --- a/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java +++ b/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +36,9 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; + +import java.util.UUID; /** * @@ -50,7 +48,7 @@ public class VaevictisAsmadi extends CardImpl { public VaevictisAsmadi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}{R}{R}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elder"); this.subtype.add("Dragon"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java b/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java index fc7c4dbe0da..bc89c12ad0e 100644 --- a/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java +++ b/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java @@ -29,8 +29,7 @@ package mage.cards.v; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Zone; +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,10 +42,6 @@ import mage.abilities.keyword.ScavengeAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -67,7 +62,7 @@ public class VarolzTheScarStriped extends CardImpl { public VarolzTheScarStriped(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Troll"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/v/VassalsDuty.java b/Mage.Sets/src/mage/cards/v/VassalsDuty.java index 8ce8ef151a1..98db6b0aece 100644 --- a/Mage.Sets/src/mage/cards/v/VassalsDuty.java +++ b/Mage.Sets/src/mage/cards/v/VassalsDuty.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -53,7 +54,7 @@ public class VassalsDuty extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("legendary creature you control"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public VassalsDuty(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VeinfireBorderpost.java b/Mage.Sets/src/mage/cards/v/VeinfireBorderpost.java index 9f17b6b5d4a..dd2dfa13405 100644 --- a/Mage.Sets/src/mage/cards/v/VeinfireBorderpost.java +++ b/Mage.Sets/src/mage/cards/v/VeinfireBorderpost.java @@ -39,6 +39,7 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -53,7 +54,7 @@ public class VeinfireBorderpost extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a basic land"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public VeinfireBorderpost (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java index 4bef54d2435..5e1803ecefc 100644 --- a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java +++ b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java @@ -27,11 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,9 +36,12 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +56,7 @@ public class VelaTheNightClad extends CardImpl { public VelaTheNightClad(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java b/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java index 0b72b8aab67..34a24b76900 100644 --- a/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java +++ b/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,8 +38,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; +import java.util.UUID; + /** * * @author fireshoes @@ -49,7 +51,7 @@ public class VeldraneOfSengir extends CardImpl { public VeldraneOfSengir(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/v/VendilionClique.java b/Mage.Sets/src/mage/cards/v/VendilionClique.java index f88ccafd573..c510d7cedcb 100644 --- a/Mage.Sets/src/mage/cards/v/VendilionClique.java +++ b/Mage.Sets/src/mage/cards/v/VendilionClique.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -41,6 +40,7 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterNonlandCard; import mage.game.Game; @@ -48,6 +48,8 @@ import mage.players.Player; import mage.target.TargetCard; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author Loki @@ -56,7 +58,7 @@ public class VendilionClique extends CardImpl { public VendilionClique(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Faerie"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/v/VenserShaperSavant.java b/Mage.Sets/src/mage/cards/v/VenserShaperSavant.java index f17f53f3d5b..cbd0b412428 100644 --- a/Mage.Sets/src/mage/cards/v/VenserShaperSavant.java +++ b/Mage.Sets/src/mage/cards/v/VenserShaperSavant.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,9 +35,12 @@ import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.target.Target; import mage.target.common.TargetSpellOrPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -47,7 +49,7 @@ public class VenserShaperSavant extends CardImpl { public VenserShaperSavant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java b/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java index da0071c2d59..77722b7cb51 100644 --- a/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java +++ b/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java @@ -43,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -61,7 +62,7 @@ public class VerdelothTheAncient extends CardImpl { public VerdelothTheAncient(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Treefolk"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/v/VhatiIlDal.java b/Mage.Sets/src/mage/cards/v/VhatiIlDal.java index 7801dfdb9d1..3d3b3979751 100644 --- a/Mage.Sets/src/mage/cards/v/VhatiIlDal.java +++ b/Mage.Sets/src/mage/cards/v/VhatiIlDal.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,14 +38,13 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.SetPowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +53,7 @@ public class VhatiIlDal extends CardImpl { public VhatiIlDal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java b/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java index 62682147599..de2d072c273 100644 --- a/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java +++ b/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java @@ -27,10 +27,6 @@ */ package mage.cards.v; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -41,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -48,6 +45,11 @@ import mage.players.Player; import mage.util.RandomUtil; import mage.watchers.common.SpellsCastWatcher; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +59,7 @@ public class VialSmasherTheFierce extends CardImpl { public VialSmasherTheFierce(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Berserker"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java b/Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java index eba44489bb5..ae04aa2dd5c 100644 --- a/Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java +++ b/Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -37,9 +36,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -48,7 +50,7 @@ public class VisaraTheDreadful extends CardImpl { public VisaraTheDreadful(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Gorgon"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/v/VishKalBloodArbiter.java b/Mage.Sets/src/mage/cards/v/VishKalBloodArbiter.java index 93361309cf3..4891dc7e04c 100644 --- a/Mage.Sets/src/mage/cards/v/VishKalBloodArbiter.java +++ b/Mage.Sets/src/mage/cards/v/VishKalBloodArbiter.java @@ -45,6 +45,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.Counter; import mage.counters.CounterType; @@ -64,7 +65,7 @@ public class VishKalBloodArbiter extends CardImpl { public VishKalBloodArbiter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Vampire"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java b/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java index 4f26fdf2b1d..4cf757680c8 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java +++ b/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,9 +39,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) @@ -51,7 +53,7 @@ public class VolrathTheFallen extends CardImpl { public VolrathTheFallen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Shapeshifter"); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java index 1e167548d4f..0198ed05f52 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java @@ -27,8 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -39,15 +37,12 @@ import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author ImperatorPrime */ @@ -119,11 +114,10 @@ class VolrathsShapeshifterEffect extends ContinuousEffectImpl { } } - permanent.getSupertype().clear(); - for (String type : card.getSupertype()) { - if (!permanent.getSupertype().contains(type)) { - permanent.getSupertype().add(type); - } + permanent.getSuperType().clear(); + for (SuperType type : card.getSuperType()) { + permanent.getSuperType().add(type); + } for (Ability ability : card.getAbilities()) { diff --git a/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java b/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java index 71b462cc54e..454b8bdbb9f 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java @@ -27,9 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -38,11 +35,15 @@ import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -57,7 +58,7 @@ public class VolrathsStronghold extends CardImpl { public VolrathsStronghold(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java b/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java index ed574cb2eaa..0c77619012d 100644 --- a/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java +++ b/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.Counter; import mage.filter.FilterPermanent; @@ -47,6 +47,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -64,7 +66,7 @@ public class VorelOfTheHullClade extends CardImpl { public VorelOfTheHullClade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Merfolk"); diff --git a/Mage.Sets/src/mage/cards/v/VorinclexVoiceOfHunger.java b/Mage.Sets/src/mage/cards/v/VorinclexVoiceOfHunger.java index 699155036a5..2bf3c492309 100644 --- a/Mage.Sets/src/mage/cards/v/VorinclexVoiceOfHunger.java +++ b/Mage.Sets/src/mage/cards/v/VorinclexVoiceOfHunger.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.TapForManaAllTriggeredManaAbility; @@ -39,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SetTargetPointer; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; @@ -47,6 +47,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author BetaSteward @@ -55,7 +57,7 @@ public class VorinclexVoiceOfHunger extends CardImpl { public VorinclexVoiceOfHunger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Praetor"); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/v/VoroshTheHunter.java b/Mage.Sets/src/mage/cards/v/VoroshTheHunter.java index ee59bc7959a..656d90470ae 100644 --- a/Mage.Sets/src/mage/cards/v/VoroshTheHunter.java +++ b/Mage.Sets/src/mage/cards/v/VoroshTheHunter.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +36,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 @@ -47,7 +49,7 @@ public class VoroshTheHunter extends CardImpl { public VoroshTheHunter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/w/WallOfShards.java b/Mage.Sets/src/mage/cards/w/WallOfShards.java index ddc48b6f15d..f1e525c7a79 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfShards.java +++ b/Mage.Sets/src/mage/cards/w/WallOfShards.java @@ -27,15 +27,17 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.common.GainLifeOpponentCost; +import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -45,7 +47,7 @@ public class WallOfShards extends CardImpl { public WallOfShards(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.supertype.add("Snow"); + addSuperType(SuperType.SNOW); this.subtype.add("Wall"); this.power = new MageInt(1); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/w/Wastes.java b/Mage.Sets/src/mage/cards/w/Wastes.java index 46575754727..8ceab0ceb73 100644 --- a/Mage.Sets/src/mage/cards/w/Wastes.java +++ b/Mage.Sets/src/mage/cards/w/Wastes.java @@ -32,6 +32,7 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -41,7 +42,7 @@ public class Wastes extends CardImpl { public Wastes(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Basic"); + addSuperType(SuperType.BASIC); // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/w/WhipOfErebos.java b/Mage.Sets/src/mage/cards/w/WhipOfErebos.java index 543dcbf8316..b7408e74e4c 100644 --- a/Mage.Sets/src/mage/cards/w/WhipOfErebos.java +++ b/Mage.Sets/src/mage/cards/w/WhipOfErebos.java @@ -46,10 +46,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -68,7 +65,7 @@ public class WhipOfErebos extends CardImpl { public WhipOfErebos(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.ARTIFACT},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // Creatures you control have lifelink. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures")))); diff --git a/Mage.Sets/src/mage/cards/w/WithengarUnbound.java b/Mage.Sets/src/mage/cards/w/WithengarUnbound.java index f1164e0380f..d804e4e438d 100644 --- a/Mage.Sets/src/mage/cards/w/WithengarUnbound.java +++ b/Mage.Sets/src/mage/cards/w/WithengarUnbound.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -37,12 +36,15 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward @@ -51,7 +53,7 @@ public class WithengarUnbound extends CardImpl { public WithengarUnbound(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/cards/w/WortBoggartAuntie.java b/Mage.Sets/src/mage/cards/w/WortBoggartAuntie.java index 5911838d82f..021d3e5293c 100644 --- a/Mage.Sets/src/mage/cards/w/WortBoggartAuntie.java +++ b/Mage.Sets/src/mage/cards/w/WortBoggartAuntie.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -36,11 +35,14 @@ import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author Loki @@ -55,7 +57,7 @@ public class WortBoggartAuntie extends CardImpl { public WortBoggartAuntie(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java b/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java index 64ffa7ef8b4..c19d807ae12 100644 --- a/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java +++ b/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,12 +37,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ConspireAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterInstantOrSorcerySpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -52,6 +46,8 @@ import mage.game.permanent.token.Token; import mage.game.stack.Spell; import mage.game.stack.StackObject; +import java.util.UUID; + /** * * @author LevelX2 @@ -60,7 +56,7 @@ public class WortTheRaidmother extends CardImpl { public WortTheRaidmother(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R/G}{R/G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Shaman"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java b/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java index d0c137f8af6..05026961343 100644 --- a/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java +++ b/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -38,10 +37,7 @@ import mage.abilities.keyword.SwampwalkAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -55,6 +51,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -63,7 +61,7 @@ public class WrexialTheRisenDeep extends CardImpl { public WrexialTheRisenDeep(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Kraken"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java b/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java index d6f977f980a..428667ea452 100644 --- a/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java +++ b/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -38,6 +37,8 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import java.util.UUID; @@ -50,7 +51,7 @@ public class WydwenTheBitingGale extends CardImpl { public WydwenTheBitingGale(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Faerie"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java b/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java index fe3bd422282..3d51d48577e 100644 --- a/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java +++ b/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java @@ -27,7 +27,6 @@ */ package mage.cards.x; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -43,18 +42,15 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +64,7 @@ public class XenagosGodOfRevels extends CardImpl { public XenagosGodOfRevels(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("God"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/x/XiahouDunTheOneEyed.java b/Mage.Sets/src/mage/cards/x/XiahouDunTheOneEyed.java index 05c62821d62..42be882c026 100644 --- a/Mage.Sets/src/mage/cards/x/XiahouDunTheOneEyed.java +++ b/Mage.Sets/src/mage/cards/x/XiahouDunTheOneEyed.java @@ -27,7 +27,6 @@ */ package mage.cards.x; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -39,11 +38,14 @@ import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** * * @author fireshoes @@ -58,7 +60,7 @@ public class XiahouDunTheOneEyed extends CardImpl { public XiahouDunTheOneEyed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/x/XiraArien.java b/Mage.Sets/src/mage/cards/x/XiraArien.java index f60ead35cdf..2d9eef2e5e9 100644 --- a/Mage.Sets/src/mage/cards/x/XiraArien.java +++ b/Mage.Sets/src/mage/cards/x/XiraArien.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetPlayer; @@ -49,7 +50,7 @@ public class XiraArien extends CardImpl { public XiraArien(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Insect"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/x/XunYuWeiAdvisor.java b/Mage.Sets/src/mage/cards/x/XunYuWeiAdvisor.java index defee2e52a0..40d3dffd0be 100644 --- a/Mage.Sets/src/mage/cards/x/XunYuWeiAdvisor.java +++ b/Mage.Sets/src/mage/cards/x/XunYuWeiAdvisor.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; @@ -49,7 +50,7 @@ public class XunYuWeiAdvisor extends CardImpl { public XunYuWeiAdvisor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/y/YahenniUndyingPartisan.java b/Mage.Sets/src/mage/cards/y/YahenniUndyingPartisan.java index f1a38f4a96e..0e8bcfdaf36 100644 --- a/Mage.Sets/src/mage/cards/y/YahenniUndyingPartisan.java +++ b/Mage.Sets/src/mage/cards/y/YahenniUndyingPartisan.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -47,6 +47,8 @@ import mage.filter.common.FilterOpponentsCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -62,7 +64,7 @@ public class YahenniUndyingPartisan extends CardImpl { public YahenniUndyingPartisan(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Aetherborn"); this.subtype.add("Vampire"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java b/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java index 79a9f159a61..5f0731526c5 100644 --- a/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java +++ b/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; @@ -43,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.ObjectSourcePlayer; @@ -52,6 +52,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -67,7 +69,7 @@ public class YasovaDragonclaw extends CardImpl { public YasovaDragonclaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Warrior"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/y/YavimayaHollow.java b/Mage.Sets/src/mage/cards/y/YavimayaHollow.java index da2ed09d1f5..eec20585583 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaHollow.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaHollow.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,9 +36,12 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -48,7 +50,7 @@ public class YavimayaHollow extends CardImpl { public YavimayaHollow(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java b/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java index 2493e290691..6df148dc385 100644 --- a/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java +++ b/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ColorPredicate; +import java.util.UUID; + /** * * @author North @@ -54,7 +56,7 @@ public class YevaNaturesHerald extends CardImpl { public YevaNaturesHerald(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Elf"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/cards/y/YidrisMaelstromWielder.java b/Mage.Sets/src/mage/cards/y/YidrisMaelstromWielder.java index 47e36a19ab5..f3e59a75040 100644 --- a/Mage.Sets/src/mage/cards/y/YidrisMaelstromWielder.java +++ b/Mage.Sets/src/mage/cards/y/YidrisMaelstromWielder.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -36,17 +35,14 @@ import mage.abilities.keyword.CascadeAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -56,7 +52,7 @@ public class YidrisMaelstromWielder extends CardImpl { public YidrisMaelstromWielder(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}{B}{R}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Ogre"); this.subtype.add("Wizard"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java b/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java index c62fe643903..f5d657079f2 100644 --- a/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java +++ b/Mage.Sets/src/mage/cards/y/YisanTheWandererBard.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -40,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.Counter; import mage.filter.Filter; @@ -51,6 +51,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -59,7 +61,7 @@ public class YisanTheWandererBard extends CardImpl { public YisanTheWandererBard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java b/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java index 0eaa6fe76d0..b707816d037 100644 --- a/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java +++ b/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -47,7 +48,7 @@ public class YomijiWhoBarsTheWay extends CardImpl { public YomijiWhoBarsTheWay(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Spirit"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java b/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java index e4a970a6cf8..0f18d87dd88 100644 --- a/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java +++ b/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java @@ -27,9 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -39,6 +36,9 @@ import mage.abilities.effects.common.SkipNextPlayerUntapStepEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -49,6 +49,8 @@ import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.Targets; +import java.util.UUID; + /** * * @author LevelX @@ -57,7 +59,7 @@ public class YoseiTheMorningStar extends CardImpl { public YoseiTheMorningStar(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Dragon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java b/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java index 45bb86f97f6..689d4fb0309 100644 --- a/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java +++ b/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedByMoreThanOneAllEffect; @@ -35,9 +34,12 @@ import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -46,7 +48,7 @@ public class YuanShaoTheIndecisive extends CardImpl { public YuanShaoTheIndecisive(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/y/YukoraThePrisoner.java b/Mage.Sets/src/mage/cards/y/YukoraThePrisoner.java index d8a6fc9ce1a..34d20948ceb 100644 --- a/Mage.Sets/src/mage/cards/y/YukoraThePrisoner.java +++ b/Mage.Sets/src/mage/cards/y/YukoraThePrisoner.java @@ -27,8 +27,6 @@ */ package mage.cards.y; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; @@ -37,12 +35,16 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.List; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +59,7 @@ public class YukoraThePrisoner extends CardImpl { public YukoraThePrisoner(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Demon"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java b/Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java index d127d6c115f..e944f90d035 100644 --- a/Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java +++ b/Mage.Sets/src/mage/cards/z/ZadaHedronGrinder.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -37,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -47,6 +47,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +57,7 @@ public class ZadaHedronGrinder extends CardImpl { public ZadaHedronGrinder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Ally"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZamWesell.java b/Mage.Sets/src/mage/cards/z/ZamWesell.java index 23351edfc4e..b20cd69bf5e 100644 --- a/Mage.Sets/src/mage/cards/z/ZamWesell.java +++ b/Mage.Sets/src/mage/cards/z/ZamWesell.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -37,16 +36,15 @@ import mage.abilities.effects.common.RevealHandTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Styxo @@ -55,7 +53,7 @@ public class ZamWesell extends CardImpl { public ZamWesell(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Shapeshifter"); this.subtype.add("Hunter"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java b/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java index fec7a17f5a4..02cbf8ae876 100644 --- a/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java +++ b/Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java @@ -41,13 +41,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -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.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledPermanent; @@ -61,7 +55,7 @@ public class ZedruuTheGreathearted extends CardImpl { public ZedruuTheGreathearted(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Minotaur"); this.subtype.add("Monk"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java b/Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java index 590679816d5..a87324deea0 100644 --- a/Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java +++ b/Mage.Sets/src/mage/cards/z/ZhangFeiFierceWarrior.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; /** * @@ -43,7 +44,7 @@ public class ZhangFeiFierceWarrior extends CardImpl { public ZhangFeiFierceWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java b/Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java index 08cebeef145..63c940a6b7b 100644 --- a/Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java +++ b/Mage.Sets/src/mage/cards/z/ZhangHeWeiGeneral.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -36,8 +35,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author LoneFox @@ -46,7 +48,7 @@ public class ZhangHeWeiGeneral extends CardImpl { public ZhangHeWeiGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java b/Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java index a50bf4c0f5f..78e98ec34ad 100644 --- a/Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java +++ b/Mage.Sets/src/mage/cards/z/ZhangLiaoHeroOfHefei.java @@ -27,13 +27,15 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsDamageToOpponentTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -43,7 +45,7 @@ public class ZhangLiaoHeroOfHefei extends CardImpl { public ZhangLiaoHeroOfHefei(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java b/Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java index dcdce3fe06f..22f0c56b70e 100644 --- a/Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java +++ b/Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,6 +35,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; + +import java.util.UUID; /** * @@ -45,7 +47,7 @@ public class ZhaoZilongTigerGeneral extends CardImpl { public ZhaoZilongTigerGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java b/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java index ed090cfd1b4..007c511f37b 100644 --- a/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java +++ b/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java @@ -27,16 +27,18 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -45,7 +47,7 @@ public class ZhouYuChiefCommander extends CardImpl { public ZhouYuChiefCommander(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java b/Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java index 4a06d83ef25..817f28dc26a 100644 --- a/Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java +++ b/Mage.Sets/src/mage/cards/z/ZhugeJinWuStrategist.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -38,9 +37,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -49,7 +51,7 @@ public class ZhugeJinWuStrategist extends CardImpl { public ZhugeJinWuStrategist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); diff --git a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java index c636470678a..38d15c06569 100644 --- a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java +++ b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -43,10 +42,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -55,6 +51,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author fireshoes @@ -63,7 +61,7 @@ public class ZirilanOfTheClaw extends CardImpl { public ZirilanOfTheClaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Viashino"); this.subtype.add("Shaman"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java b/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java index db42c2bab7f..9fa034d4bc5 100644 --- a/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java +++ b/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -43,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX @@ -51,7 +53,7 @@ public class ZoZuThePunisher extends CardImpl { public ZoZuThePunisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Goblin"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java b/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java index 51cff78f448..055235b3971 100644 --- a/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java +++ b/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -36,9 +35,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; +import java.util.UUID; + /** * * @author nigelzor @@ -49,7 +51,7 @@ public class ZuberiGoldenFeather extends CardImpl { public ZuberiGoldenFeather(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Griffin"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java b/Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java index b5a5178a867..11237a83f57 100644 --- a/Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java +++ b/Mage.Sets/src/mage/cards/z/ZuoCiTheMockingSage.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -37,9 +36,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; +import java.util.UUID; + /** * * @author LoneFox @@ -54,7 +56,7 @@ public class ZuoCiTheMockingSage extends CardImpl { public ZuoCiTheMockingSage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Advisor"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java b/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java index fce7ecb247c..517c63b07a1 100644 --- a/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java +++ b/Mage.Sets/src/mage/cards/z/ZurTheEnchanter.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -56,7 +57,7 @@ public class ZurTheEnchanter extends CardImpl { public ZurTheEnchanter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{U}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java index b7b235d46a4..d94c5ca2674 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.combat.CantBlockCreaturesSourceEffect; @@ -35,11 +34,14 @@ import mage.abilities.keyword.DashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -54,7 +56,7 @@ public class ZurgoBellstriker extends CardImpl { public ZurgoBellstriker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Orc"); this.subtype.add("Warrior"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java b/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java index 467e99f3309..0ab0340d05c 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; @@ -42,9 +41,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class ZurgoHelmsmasher extends CardImpl { public ZurgoHelmsmasher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{W}{B}"); - this.supertype.add("Legendary"); + addSuperType(SuperType.LEGENDARY); this.subtype.add("Orc"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/sets/AetherRevolt.java b/Mage.Sets/src/mage/sets/AetherRevolt.java index 21d57b6747b..df82862824e 100644 --- a/Mage.Sets/src/mage/sets/AetherRevolt.java +++ b/Mage.Sets/src/mage/sets/AetherRevolt.java @@ -27,8 +27,6 @@ */ package mage.sets; -import java.util.ArrayList; -import java.util.List; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; @@ -36,6 +34,9 @@ import mage.cards.repository.CardRepository; import mage.constants.Rarity; import mage.constants.SetType; +import java.util.ArrayList; +import java.util.List; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java index d6be2178e8d..fef67a6f615 100644 --- a/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java +++ b/Mage.Sets/src/mage/sets/AjaniVsNicolBolas.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Alliances.java b/Mage.Sets/src/mage/sets/Alliances.java index 732d3a6e9e1..d8161aa45d3 100644 --- a/Mage.Sets/src/mage/sets/Alliances.java +++ b/Mage.Sets/src/mage/sets/Alliances.java @@ -1,5 +1,6 @@ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.a.AesthirGlider; import mage.cards.a.AgentOfStromgald; @@ -18,10 +19,8 @@ import mage.cards.s.SoldeviSage; import mage.cards.s.StormShaman; import mage.cards.s.SwampMosquito; import mage.cards.w.WhipVine; -import mage.constants.SetType; - import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; public class Alliances extends ExpansionSet { private static final Alliances instance = new Alliances(); diff --git a/Mage.Sets/src/mage/sets/Antiquities.java b/Mage.Sets/src/mage/sets/Antiquities.java index c3f94b8ce87..91a19a76fea 100644 --- a/Mage.Sets/src/mage/sets/Antiquities.java +++ b/Mage.Sets/src/mage/sets/Antiquities.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Apocalypse.java b/Mage.Sets/src/mage/sets/Apocalypse.java index fcc294d49ad..cab2812e694 100644 --- a/Mage.Sets/src/mage/sets/Apocalypse.java +++ b/Mage.Sets/src/mage/sets/Apocalypse.java @@ -1,8 +1,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; public class Apocalypse extends ExpansionSet { private static final Apocalypse instance = new Apocalypse(); diff --git a/Mage.Sets/src/mage/sets/ArabianNights.java b/Mage.Sets/src/mage/sets/ArabianNights.java index a1bb8fc7029..88a578a7519 100644 --- a/Mage.Sets/src/mage/sets/ArabianNights.java +++ b/Mage.Sets/src/mage/sets/ArabianNights.java @@ -27,6 +27,7 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.a.ArmyOfAllah; import mage.cards.f.FishliverOil; @@ -35,9 +36,8 @@ import mage.cards.o.Oubliette; import mage.cards.p.Piety; import mage.cards.r.RukhEgg; import mage.cards.s.StoneThrowingDevils; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Archenemy.java b/Mage.Sets/src/mage/sets/Archenemy.java index 5c2ad23170f..a38e906637c 100644 --- a/Mage.Sets/src/mage/sets/Archenemy.java +++ b/Mage.Sets/src/mage/sets/Archenemy.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ArenaLeague.java b/Mage.Sets/src/mage/sets/ArenaLeague.java index 2318bca3d88..a3da2323cfe 100644 --- a/Mage.Sets/src/mage/sets/ArenaLeague.java +++ b/Mage.Sets/src/mage/sets/ArenaLeague.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java b/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java index f8b8ce308fa..d327c5e295b 100644 --- a/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java +++ b/Mage.Sets/src/mage/sets/AsiaPacificLandProgram.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/AvacynRestored.java b/Mage.Sets/src/mage/sets/AvacynRestored.java index 6f3862c984a..7a29c9dd579 100644 --- a/Mage.Sets/src/mage/sets/AvacynRestored.java +++ b/Mage.Sets/src/mage/sets/AvacynRestored.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/BattleForZendikar.java b/Mage.Sets/src/mage/sets/BattleForZendikar.java index aa532e35ee0..41f48359b17 100644 --- a/Mage.Sets/src/mage/sets/BattleForZendikar.java +++ b/Mage.Sets/src/mage/sets/BattleForZendikar.java @@ -27,16 +27,17 @@ */ package mage.sets; -import java.util.ArrayList; -import java.util.List; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; +import mage.cards.FrameStyle; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; -import mage.cards.FrameStyle; +import mage.constants.SetType; + +import java.util.ArrayList; +import java.util.List; /** * diff --git a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java index adbc90bbb62..d950e678eff 100644 --- a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java @@ -27,9 +27,9 @@ */ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/BlessedVsCursed.java b/Mage.Sets/src/mage/sets/BlessedVsCursed.java index 888b9b7bb9b..282e35abd30 100644 --- a/Mage.Sets/src/mage/sets/BlessedVsCursed.java +++ b/Mage.Sets/src/mage/sets/BlessedVsCursed.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/BornOfTheGods.java b/Mage.Sets/src/mage/sets/BornOfTheGods.java index 6456a7d9076..9c72e443b8d 100644 --- a/Mage.Sets/src/mage/sets/BornOfTheGods.java +++ b/Mage.Sets/src/mage/sets/BornOfTheGods.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java index afc0cc8aa59..06a82cdaf9d 100644 --- a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java @@ -1,10 +1,10 @@ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.b.BrothersYamazaki; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; public class ChampionsOfKamigawa extends ExpansionSet { private static final ChampionsOfKamigawa instance = new ChampionsOfKamigawa(); diff --git a/Mage.Sets/src/mage/sets/Champs.java b/Mage.Sets/src/mage/sets/Champs.java index 4c6b34821a0..190ada247da 100644 --- a/Mage.Sets/src/mage/sets/Champs.java +++ b/Mage.Sets/src/mage/sets/Champs.java @@ -28,8 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Chronicles.java b/Mage.Sets/src/mage/sets/Chronicles.java index 31822147e42..7c470a6b519 100644 --- a/Mage.Sets/src/mage/sets/Chronicles.java +++ b/Mage.Sets/src/mage/sets/Chronicles.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ClashPack.java b/Mage.Sets/src/mage/sets/ClashPack.java index 6e13659c534..f90951d9a8d 100644 --- a/Mage.Sets/src/mage/sets/ClashPack.java +++ b/Mage.Sets/src/mage/sets/ClashPack.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java index ec44f1d75c0..126381d200b 100644 --- a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java +++ b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java @@ -27,15 +27,15 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.d.DrySpell; import mage.cards.f.FeastOfTheUnicorn; import mage.cards.m.MesaFalcon; import mage.cards.s.SoldeviSage; import mage.cards.v.VodalianSoldiers; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Coldsnap.java b/Mage.Sets/src/mage/sets/Coldsnap.java index 97217e0a497..a778326a04b 100644 --- a/Mage.Sets/src/mage/sets/Coldsnap.java +++ b/Mage.Sets/src/mage/sets/Coldsnap.java @@ -28,8 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Commander.java b/Mage.Sets/src/mage/sets/Commander.java index 98c6da9b7a5..4249e15a877 100644 --- a/Mage.Sets/src/mage/sets/Commander.java +++ b/Mage.Sets/src/mage/sets/Commander.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Commander2013.java b/Mage.Sets/src/mage/sets/Commander2013.java index 151d8ac74b5..2dc69fe51d6 100644 --- a/Mage.Sets/src/mage/sets/Commander2013.java +++ b/Mage.Sets/src/mage/sets/Commander2013.java @@ -28,11 +28,11 @@ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.n.NightSoil; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Commander2014.java b/Mage.Sets/src/mage/sets/Commander2014.java index b6e073691c8..3e617892a9f 100644 --- a/Mage.Sets/src/mage/sets/Commander2014.java +++ b/Mage.Sets/src/mage/sets/Commander2014.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Commander2015.java b/Mage.Sets/src/mage/sets/Commander2015.java index c24ab32f39f..8ecf206916f 100644 --- a/Mage.Sets/src/mage/sets/Commander2015.java +++ b/Mage.Sets/src/mage/sets/Commander2015.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/CommandersArsenal.java b/Mage.Sets/src/mage/sets/CommandersArsenal.java index 7f9ece8cea7..91cde737601 100644 --- a/Mage.Sets/src/mage/sets/CommandersArsenal.java +++ b/Mage.Sets/src/mage/sets/CommandersArsenal.java @@ -28,8 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Conflux.java b/Mage.Sets/src/mage/sets/Conflux.java index b2ced401946..4e78923fab7 100644 --- a/Mage.Sets/src/mage/sets/Conflux.java +++ b/Mage.Sets/src/mage/sets/Conflux.java @@ -28,9 +28,9 @@ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Conspiracy.java b/Mage.Sets/src/mage/sets/Conspiracy.java index 56fbffe3c68..64cbdc98643 100644 --- a/Mage.Sets/src/mage/sets/Conspiracy.java +++ b/Mage.Sets/src/mage/sets/Conspiracy.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java b/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java index 30fa1fdbf70..9f0f6800d93 100644 --- a/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java +++ b/Mage.Sets/src/mage/sets/ConspiracyTakeTheCrown.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/DarkAscension.java b/Mage.Sets/src/mage/sets/DarkAscension.java index 9ff75e90855..919dab51ce3 100644 --- a/Mage.Sets/src/mage/sets/DarkAscension.java +++ b/Mage.Sets/src/mage/sets/DarkAscension.java @@ -27,9 +27,9 @@ */ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Darksteel.java b/Mage.Sets/src/mage/sets/Darksteel.java index e926542e3be..7883329e504 100644 --- a/Mage.Sets/src/mage/sets/Darksteel.java +++ b/Mage.Sets/src/mage/sets/Darksteel.java @@ -1,9 +1,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; - import mage.constants.Rarity; +import mage.constants.SetType; public class Darksteel extends ExpansionSet { @@ -96,7 +95,7 @@ public class Darksteel extends ExpansionSet { cards.add(new SetCardInfo("Leonin Shikari", 6, Rarity.RARE, mage.cards.l.LeoninShikari.class)); cards.add(new SetCardInfo("Lich's Tomb", 128, Rarity.RARE, mage.cards.l.LichsTomb.class)); cards.add(new SetCardInfo("Loxodon Mystic", 7, Rarity.COMMON, mage.cards.l.LoxodonMystic.class)); - cards.add(new SetCardInfo("Machinate", 24, Rarity.COMMON, mage.cards.m.Machinate.class)); + cards.add(new SetCardInfo("Machinate", 24, Rarity.COMMON, mage.cards.m.Machinate.class)); cards.add(new SetCardInfo("Magnetic Flux", 25, Rarity.COMMON, mage.cards.m.MagneticFlux.class)); cards.add(new SetCardInfo("Memnarch", 129, Rarity.RARE, mage.cards.m.Memnarch.class)); cards.add(new SetCardInfo("Mephitic Ooze", 47, Rarity.RARE, mage.cards.m.MephiticOoze.class)); diff --git a/Mage.Sets/src/mage/sets/Dissension.java b/Mage.Sets/src/mage/sets/Dissension.java index 3362ed00ac2..1dbbd6dbccd 100644 --- a/Mage.Sets/src/mage/sets/Dissension.java +++ b/Mage.Sets/src/mage/sets/Dissension.java @@ -28,9 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; - import mage.constants.Rarity; +import mage.constants.SetType; /** * Created by IntelliJ IDEA. User: Loki Date: 20.12.10 Time: 21:40 diff --git a/Mage.Sets/src/mage/sets/DivineVsDemonic.java b/Mage.Sets/src/mage/sets/DivineVsDemonic.java index c18dfb7d741..4d099484425 100644 --- a/Mage.Sets/src/mage/sets/DivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/DivineVsDemonic.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/DragonsMaze.java b/Mage.Sets/src/mage/sets/DragonsMaze.java index a022fee617d..63bb3521665 100644 --- a/Mage.Sets/src/mage/sets/DragonsMaze.java +++ b/Mage.Sets/src/mage/sets/DragonsMaze.java @@ -28,17 +28,17 @@ package mage.sets; -import java.util.ArrayList; -import java.util.List; - -import mage.constants.CardType; -import mage.constants.Rarity; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.SetType; +import java.util.ArrayList; +import java.util.List; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/sets/DragonsOfTarkir.java b/Mage.Sets/src/mage/sets/DragonsOfTarkir.java index beee02ce178..d7a34ef976f 100644 --- a/Mage.Sets/src/mage/sets/DragonsOfTarkir.java +++ b/Mage.Sets/src/mage/sets/DragonsOfTarkir.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java b/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java index e8d85320fea..90e6b7ee4aa 100644 --- a/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java +++ b/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ElspethVsKiora.java b/Mage.Sets/src/mage/sets/ElspethVsKiora.java index e88da2c2f33..27dd394e363 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsKiora.java +++ b/Mage.Sets/src/mage/sets/ElspethVsKiora.java @@ -27,11 +27,11 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.i.IcatianJavelineers; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java b/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java index 1720d1d64ab..289bc176f2d 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java +++ b/Mage.Sets/src/mage/sets/ElspethVsTezzeret.java @@ -1,10 +1,9 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; public class ElspethVsTezzeret extends ExpansionSet { private static final ElspethVsTezzeret instance = new ElspethVsTezzeret(); diff --git a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java index b026d3d66dc..ebc7834bb32 100644 --- a/Mage.Sets/src/mage/sets/ElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/ElvesVsGoblins.java @@ -6,10 +6,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/EternalMasters.java b/Mage.Sets/src/mage/sets/EternalMasters.java index 944b3d7de12..34725c51ce3 100644 --- a/Mage.Sets/src/mage/sets/EternalMasters.java +++ b/Mage.Sets/src/mage/sets/EternalMasters.java @@ -30,8 +30,8 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.cards.h.HymnToTourach; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Eventide.java b/Mage.Sets/src/mage/sets/Eventide.java index ec865bae5b1..825c59b56fe 100644 --- a/Mage.Sets/src/mage/sets/Eventide.java +++ b/Mage.Sets/src/mage/sets/Eventide.java @@ -1,9 +1,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; - import mage.constants.Rarity; +import mage.constants.SetType; public class Eventide extends ExpansionSet { private static final Eventide instance = new Eventide(); diff --git a/Mage.Sets/src/mage/sets/FallenEmpires.java b/Mage.Sets/src/mage/sets/FallenEmpires.java index 987ac79ab1f..dfd8deabd21 100644 --- a/Mage.Sets/src/mage/sets/FallenEmpires.java +++ b/Mage.Sets/src/mage/sets/FallenEmpires.java @@ -27,6 +27,7 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.a.ArmorThrull; import mage.cards.b.BasalThrull; @@ -58,9 +59,8 @@ import mage.cards.o.OrderOfTheEbonHand; import mage.cards.t.ThornThallid; import mage.cards.v.VodalianMage; import mage.cards.v.VodalianSoldiers; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/FateReforged.java b/Mage.Sets/src/mage/sets/FateReforged.java index 58c65acfe48..ba8da915c29 100644 --- a/Mage.Sets/src/mage/sets/FateReforged.java +++ b/Mage.Sets/src/mage/sets/FateReforged.java @@ -27,8 +27,7 @@ */ package mage.sets; -import java.util.ArrayList; -import java.util.List; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; @@ -36,7 +35,9 @@ import mage.cards.repository.CardRepository; import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.SetType; -import mage.cards.CardGraphicInfo; + +import java.util.ArrayList; +import java.util.List; /** * diff --git a/Mage.Sets/src/mage/sets/FifthDawn.java b/Mage.Sets/src/mage/sets/FifthDawn.java index 94ab5799520..b1cd70b3244 100644 --- a/Mage.Sets/src/mage/sets/FifthDawn.java +++ b/Mage.Sets/src/mage/sets/FifthDawn.java @@ -27,9 +27,9 @@ */ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/FifthEdition.java b/Mage.Sets/src/mage/sets/FifthEdition.java index 9cb9aa2bc22..50bc493f8c3 100644 --- a/Mage.Sets/src/mage/sets/FifthEdition.java +++ b/Mage.Sets/src/mage/sets/FifthEdition.java @@ -1,5 +1,6 @@ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.b.BrassclawOrcs; import mage.cards.d.DwarvenSoldier; @@ -13,9 +14,8 @@ import mage.cards.n.Necrite; import mage.cards.r.ReefPirates; import mage.cards.t.Torture; import mage.cards.v.VodalianSoldiers; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; public class FifthEdition extends ExpansionSet { diff --git a/Mage.Sets/src/mage/sets/FourthEdition.java b/Mage.Sets/src/mage/sets/FourthEdition.java index a0b6388c94c..800c9744744 100644 --- a/Mage.Sets/src/mage/sets/FourthEdition.java +++ b/Mage.Sets/src/mage/sets/FourthEdition.java @@ -27,12 +27,12 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.n.NafsAsp; import mage.cards.p.Piety; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/FutureSight.java b/Mage.Sets/src/mage/sets/FutureSight.java index 1e3b4139169..732eea8de60 100644 --- a/Mage.Sets/src/mage/sets/FutureSight.java +++ b/Mage.Sets/src/mage/sets/FutureSight.java @@ -27,9 +27,9 @@ */ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/GameDay.java b/Mage.Sets/src/mage/sets/GameDay.java index 3c73abfb6d1..120200f18c7 100644 --- a/Mage.Sets/src/mage/sets/GameDay.java +++ b/Mage.Sets/src/mage/sets/GameDay.java @@ -28,9 +28,9 @@ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java index 4d70715e31c..c36005cf86d 100644 --- a/Mage.Sets/src/mage/sets/GarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/GarrukVsLiliana.java @@ -6,10 +6,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Gatecrash.java b/Mage.Sets/src/mage/sets/Gatecrash.java index 52696e47b53..54a06ec5678 100644 --- a/Mage.Sets/src/mage/sets/Gatecrash.java +++ b/Mage.Sets/src/mage/sets/Gatecrash.java @@ -27,9 +27,9 @@ */ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Guildpact.java b/Mage.Sets/src/mage/sets/Guildpact.java index a2c6b59b631..9e4901744b0 100644 --- a/Mage.Sets/src/mage/sets/Guildpact.java +++ b/Mage.Sets/src/mage/sets/Guildpact.java @@ -29,9 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; - import mage.constants.Rarity; +import mage.constants.SetType; /** * Created by IntelliJ IDEA. User: Loki Date: 20.12.10 Time: 21:01 diff --git a/Mage.Sets/src/mage/sets/Guru.java b/Mage.Sets/src/mage/sets/Guru.java index 16c6b0979f6..4e61a7e1c8b 100644 --- a/Mage.Sets/src/mage/sets/Guru.java +++ b/Mage.Sets/src/mage/sets/Guru.java @@ -1,9 +1,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; - import mage.constants.Rarity; +import mage.constants.SetType; public class Guru extends ExpansionSet { private static final Guru instance = new Guru(); diff --git a/Mage.Sets/src/mage/sets/HeroesVsMonsters.java b/Mage.Sets/src/mage/sets/HeroesVsMonsters.java index 9feee99f996..7d9c655bc47 100644 --- a/Mage.Sets/src/mage/sets/HeroesVsMonsters.java +++ b/Mage.Sets/src/mage/sets/HeroesVsMonsters.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Homelands.java b/Mage.Sets/src/mage/sets/Homelands.java index 3580843344b..82e5ec6bd64 100644 --- a/Mage.Sets/src/mage/sets/Homelands.java +++ b/Mage.Sets/src/mage/sets/Homelands.java @@ -27,6 +27,7 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.a.AbbeyMatron; import mage.cards.a.AlibansTower; @@ -40,9 +41,8 @@ import mage.cards.r.ReefPirates; import mage.cards.s.SengirBats; import mage.cards.t.Torture; import mage.cards.w.WillowFaerie; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/IceAge.java b/Mage.Sets/src/mage/sets/IceAge.java index 71ee7713be3..c8904941765 100644 --- a/Mage.Sets/src/mage/sets/IceAge.java +++ b/Mage.Sets/src/mage/sets/IceAge.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Innistrad.java b/Mage.Sets/src/mage/sets/Innistrad.java index 66ab52956da..941a17076a5 100644 --- a/Mage.Sets/src/mage/sets/Innistrad.java +++ b/Mage.Sets/src/mage/sets/Innistrad.java @@ -28,11 +28,10 @@ package mage.sets; -import mage.constants.SetType; -import mage.cards.ExpansionSet; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java b/Mage.Sets/src/mage/sets/IzzetVsGolgari.java index ced023966ea..5e70a916d36 100644 --- a/Mage.Sets/src/mage/sets/IzzetVsGolgari.java +++ b/Mage.Sets/src/mage/sets/IzzetVsGolgari.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/JaceVsChandra.java b/Mage.Sets/src/mage/sets/JaceVsChandra.java index bc0f1f1377e..53a029e63de 100644 --- a/Mage.Sets/src/mage/sets/JaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/JaceVsChandra.java @@ -6,10 +6,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/JaceVsVraska.java b/Mage.Sets/src/mage/sets/JaceVsVraska.java index 5f0fa22e184..329eb9251fc 100644 --- a/Mage.Sets/src/mage/sets/JaceVsVraska.java +++ b/Mage.Sets/src/mage/sets/JaceVsVraska.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/JourneyIntoNyx.java b/Mage.Sets/src/mage/sets/JourneyIntoNyx.java index aa7a33202f5..d8c195adad2 100644 --- a/Mage.Sets/src/mage/sets/JourneyIntoNyx.java +++ b/Mage.Sets/src/mage/sets/JourneyIntoNyx.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Kaladesh.java b/Mage.Sets/src/mage/sets/Kaladesh.java index 2a146aeb3b1..e35054d987e 100644 --- a/Mage.Sets/src/mage/sets/Kaladesh.java +++ b/Mage.Sets/src/mage/sets/Kaladesh.java @@ -27,15 +27,16 @@ */ package mage.sets; -import java.util.ArrayList; -import java.util.List; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; + +import java.util.ArrayList; +import java.util.List; /** * diff --git a/Mage.Sets/src/mage/sets/KhansOfTarkir.java b/Mage.Sets/src/mage/sets/KhansOfTarkir.java index 8fd693de698..129344b824b 100644 --- a/Mage.Sets/src/mage/sets/KhansOfTarkir.java +++ b/Mage.Sets/src/mage/sets/KhansOfTarkir.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/KnightsVsDragons.java b/Mage.Sets/src/mage/sets/KnightsVsDragons.java index 64c9e2ecbc7..2a7ace74fa4 100644 --- a/Mage.Sets/src/mage/sets/KnightsVsDragons.java +++ b/Mage.Sets/src/mage/sets/KnightsVsDragons.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/LaunchParty.java b/Mage.Sets/src/mage/sets/LaunchParty.java index 0fb2d13d1a7..9bd0bb0d6bb 100644 --- a/Mage.Sets/src/mage/sets/LaunchParty.java +++ b/Mage.Sets/src/mage/sets/LaunchParty.java @@ -28,9 +28,9 @@ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Magic2014.java b/Mage.Sets/src/mage/sets/Magic2014.java index ae86c59ba82..846d0e1d2c3 100644 --- a/Mage.Sets/src/mage/sets/Magic2014.java +++ b/Mage.Sets/src/mage/sets/Magic2014.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Magic2015.java b/Mage.Sets/src/mage/sets/Magic2015.java index 6226014def8..7bd50098953 100644 --- a/Mage.Sets/src/mage/sets/Magic2015.java +++ b/Mage.Sets/src/mage/sets/Magic2015.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/MagicOrigins.java b/Mage.Sets/src/mage/sets/MagicOrigins.java index ab45377667f..9549124cff8 100644 --- a/Mage.Sets/src/mage/sets/MagicOrigins.java +++ b/Mage.Sets/src/mage/sets/MagicOrigins.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/MastersEdition.java b/Mage.Sets/src/mage/sets/MastersEdition.java index 54995bdd0ed..e2e2be9182f 100644 --- a/Mage.Sets/src/mage/sets/MastersEdition.java +++ b/Mage.Sets/src/mage/sets/MastersEdition.java @@ -27,6 +27,7 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.b.BasalThrull; import mage.cards.d.DwarvenSoldier; @@ -40,9 +41,8 @@ import mage.cards.o.OrderOfTheEbonHand; import mage.cards.o.Oubliette; import mage.cards.p.PhyrexianWarBeast; import mage.cards.t.ThornThallid; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/MastersEditionII.java b/Mage.Sets/src/mage/sets/MastersEditionII.java index b6c629f95c5..a33aa038c0d 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionII.java @@ -40,8 +40,8 @@ import mage.cards.l.LimDulsHighGuard; import mage.cards.n.Necrite; import mage.cards.n.NightSoil; import mage.cards.o.OrcishVeteran; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/MastersEditionIII.java b/Mage.Sets/src/mage/sets/MastersEditionIII.java index 45c57430699..f8c3a19949b 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIII.java @@ -27,11 +27,11 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.f.FeveredStrength; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/MastersEditionIV.java b/Mage.Sets/src/mage/sets/MastersEditionIV.java index 46d047be1fd..242d0a6856b 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIV.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIV.java @@ -30,8 +30,8 @@ package mage.sets; import mage.cards.ExpansionSet; import mage.cards.a.AesthirGlider; import mage.cards.e.EliteCatWarrior; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/MercadianMasques.java b/Mage.Sets/src/mage/sets/MercadianMasques.java index 2a41ed9a488..58894b294e4 100644 --- a/Mage.Sets/src/mage/sets/MercadianMasques.java +++ b/Mage.Sets/src/mage/sets/MercadianMasques.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Mirage.java b/Mage.Sets/src/mage/sets/Mirage.java index f87acb37e5e..3d05a8ae540 100644 --- a/Mage.Sets/src/mage/sets/Mirage.java +++ b/Mage.Sets/src/mage/sets/Mirage.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Mirrodin.java b/Mage.Sets/src/mage/sets/Mirrodin.java index b839f531d86..4afdc932c61 100644 --- a/Mage.Sets/src/mage/sets/Mirrodin.java +++ b/Mage.Sets/src/mage/sets/Mirrodin.java @@ -1,10 +1,9 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; public class Mirrodin extends ExpansionSet { private static final Mirrodin instance = new Mirrodin(); diff --git a/Mage.Sets/src/mage/sets/MirrodinBesieged.java b/Mage.Sets/src/mage/sets/MirrodinBesieged.java index e0022b9d8e7..e3ba3e6e1c7 100644 --- a/Mage.Sets/src/mage/sets/MirrodinBesieged.java +++ b/Mage.Sets/src/mage/sets/MirrodinBesieged.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ModernMasters.java b/Mage.Sets/src/mage/sets/ModernMasters.java index b34969203c6..3ddf81344c0 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters.java +++ b/Mage.Sets/src/mage/sets/ModernMasters.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ModernMasters2015.java b/Mage.Sets/src/mage/sets/ModernMasters2015.java index 42d52294357..7f1b96b75e7 100644 --- a/Mage.Sets/src/mage/sets/ModernMasters2015.java +++ b/Mage.Sets/src/mage/sets/ModernMasters2015.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Morningtide.java b/Mage.Sets/src/mage/sets/Morningtide.java index 585ab547a52..296de677327 100644 --- a/Mage.Sets/src/mage/sets/Morningtide.java +++ b/Mage.Sets/src/mage/sets/Morningtide.java @@ -27,9 +27,9 @@ */ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/NewPhyrexia.java b/Mage.Sets/src/mage/sets/NewPhyrexia.java index d1da556e4e0..5d3cc6d1243 100644 --- a/Mage.Sets/src/mage/sets/NewPhyrexia.java +++ b/Mage.Sets/src/mage/sets/NewPhyrexia.java @@ -1,9 +1,9 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; public class NewPhyrexia extends ExpansionSet { private static final NewPhyrexia instance = new NewPhyrexia(); diff --git a/Mage.Sets/src/mage/sets/NinthEdition.java b/Mage.Sets/src/mage/sets/NinthEdition.java index 7eff94893e8..bd71afeaf02 100644 --- a/Mage.Sets/src/mage/sets/NinthEdition.java +++ b/Mage.Sets/src/mage/sets/NinthEdition.java @@ -1,11 +1,11 @@ package mage.sets; +import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; import mage.cards.f.FishliverOil; import mage.cards.r.RukhEgg; -import mage.constants.SetType; -import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; public class NinthEdition extends ExpansionSet { diff --git a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java index 575d3fec07f..e6563d19ad6 100644 --- a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java +++ b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java @@ -5,8 +5,6 @@ */ package mage.sets; -import java.util.ArrayList; -import java.util.List; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.FrameStyle; @@ -17,6 +15,9 @@ import mage.cards.w.Wastes; import mage.constants.Rarity; import mage.constants.SetType; +import java.util.ArrayList; +import java.util.List; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/sets/Onslaught.java b/Mage.Sets/src/mage/sets/Onslaught.java index 0629df84b07..932f40e3fe1 100644 --- a/Mage.Sets/src/mage/sets/Onslaught.java +++ b/Mage.Sets/src/mage/sets/Onslaught.java @@ -1,11 +1,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; - -import mage.constants.Rarity; import mage.ObjectColor; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; public class Onslaught extends ExpansionSet { private static final Onslaught instance = new Onslaught(); diff --git a/Mage.Sets/src/mage/sets/PDSGraveborn.java b/Mage.Sets/src/mage/sets/PDSGraveborn.java index 982f7fa2779..12597cf2866 100644 --- a/Mage.Sets/src/mage/sets/PDSGraveborn.java +++ b/Mage.Sets/src/mage/sets/PDSGraveborn.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/PDSSlivers.java b/Mage.Sets/src/mage/sets/PDSSlivers.java index da7e2134f75..6ffc07bfcef 100644 --- a/Mage.Sets/src/mage/sets/PDSSlivers.java +++ b/Mage.Sets/src/mage/sets/PDSSlivers.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/PlanarChaos.java b/Mage.Sets/src/mage/sets/PlanarChaos.java index 5b0c74f06fb..f6622a868b1 100644 --- a/Mage.Sets/src/mage/sets/PlanarChaos.java +++ b/Mage.Sets/src/mage/sets/PlanarChaos.java @@ -27,9 +27,9 @@ */ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Planechase.java b/Mage.Sets/src/mage/sets/Planechase.java index 070e4e04aaa..846f655018a 100644 --- a/Mage.Sets/src/mage/sets/Planechase.java +++ b/Mage.Sets/src/mage/sets/Planechase.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Planechase2012.java b/Mage.Sets/src/mage/sets/Planechase2012.java index 39ab1ff6131..f7bff027557 100644 --- a/Mage.Sets/src/mage/sets/Planechase2012.java +++ b/Mage.Sets/src/mage/sets/Planechase2012.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Planeshift.java b/Mage.Sets/src/mage/sets/Planeshift.java index 0a0f53c08fb..98c1684d1c7 100644 --- a/Mage.Sets/src/mage/sets/Planeshift.java +++ b/Mage.Sets/src/mage/sets/Planeshift.java @@ -27,13 +27,13 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; import mage.cards.e.ErtaiTheCorrupted; import mage.cards.s.SkyshipWeatherlight; import mage.cards.t.TahngarthTalruumHero; -import mage.constants.SetType; -import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Portal.java b/Mage.Sets/src/mage/sets/Portal.java index ec9e5ed50d0..89fe56c2bf5 100644 --- a/Mage.Sets/src/mage/sets/Portal.java +++ b/Mage.Sets/src/mage/sets/Portal.java @@ -28,13 +28,13 @@ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.d.DrySpell; import mage.cards.e.EliteCatWarrior; import mage.cards.w.WarriorsCharge; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/PortalSecondAge.java b/Mage.Sets/src/mage/sets/PortalSecondAge.java index 9588d577926..e8e223bb894 100644 --- a/Mage.Sets/src/mage/sets/PortalSecondAge.java +++ b/Mage.Sets/src/mage/sets/PortalSecondAge.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java b/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java index a68fb16f6d6..ce750ae0b81 100644 --- a/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java +++ b/Mage.Sets/src/mage/sets/PortalThreeKingdoms.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/PrereleaseEvents.java b/Mage.Sets/src/mage/sets/PrereleaseEvents.java index 53cc15c0cf9..7f6f7527aa9 100644 --- a/Mage.Sets/src/mage/sets/PrereleaseEvents.java +++ b/Mage.Sets/src/mage/sets/PrereleaseEvents.java @@ -1,10 +1,9 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; public class PrereleaseEvents extends ExpansionSet { private static final PrereleaseEvents instance = new PrereleaseEvents(); diff --git a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java index 724a71792cc..928016cccaf 100644 --- a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java +++ b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java @@ -28,11 +28,10 @@ package mage.sets; -import mage.constants.SetType; -import mage.cards.ExpansionSet; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ReturnToRavnica.java b/Mage.Sets/src/mage/sets/ReturnToRavnica.java index 868d399c74d..582c0b03feb 100644 --- a/Mage.Sets/src/mage/sets/ReturnToRavnica.java +++ b/Mage.Sets/src/mage/sets/ReturnToRavnica.java @@ -27,11 +27,10 @@ */ package mage.sets; -import mage.constants.SetType; -import mage.cards.ExpansionSet; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/RevisedEdition.java b/Mage.Sets/src/mage/sets/RevisedEdition.java index e66688be20c..5a1f7f9485c 100644 --- a/Mage.Sets/src/mage/sets/RevisedEdition.java +++ b/Mage.Sets/src/mage/sets/RevisedEdition.java @@ -1,9 +1,9 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java index 233e6296792..a0bdc06968d 100644 --- a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java +++ b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java index 322e155e363..d3d7e0b4eaf 100644 --- a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java @@ -27,9 +27,9 @@ */ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java index 494766e7c96..020499af43f 100644 --- a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java +++ b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java @@ -28,11 +28,10 @@ package mage.sets; -import mage.constants.SetType; -import mage.cards.ExpansionSet; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/SeventhEdition.java b/Mage.Sets/src/mage/sets/SeventhEdition.java index f2985a4bf5c..c670f60ebbe 100644 --- a/Mage.Sets/src/mage/sets/SeventhEdition.java +++ b/Mage.Sets/src/mage/sets/SeventhEdition.java @@ -27,12 +27,12 @@ */ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.g.GoblinWarDrums; import mage.cards.s.StormShaman; -import mage.constants.SetType; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Shadowmoor.java b/Mage.Sets/src/mage/sets/Shadowmoor.java index 6851420fb5e..8a28491608c 100644 --- a/Mage.Sets/src/mage/sets/Shadowmoor.java +++ b/Mage.Sets/src/mage/sets/Shadowmoor.java @@ -27,11 +27,11 @@ */ package mage.sets; -import mage.cards.t.Torture; -import mage.constants.SetType; -import mage.cards.ExpansionSet; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.cards.t.Torture; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java b/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java index 12076b4d98f..596153d01a1 100644 --- a/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java +++ b/Mage.Sets/src/mage/sets/ShadowsOverInnistrad.java @@ -27,9 +27,6 @@ */ package mage.sets; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; import mage.cards.Card; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; @@ -40,6 +37,10 @@ import mage.constants.Rarity; import mage.constants.SetType; import mage.util.RandomUtil; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; + /** * * @author fireshoes diff --git a/Mage.Sets/src/mage/sets/ShardsOfAlara.java b/Mage.Sets/src/mage/sets/ShardsOfAlara.java index f66e40c035c..cc8689e3831 100644 --- a/Mage.Sets/src/mage/sets/ShardsOfAlara.java +++ b/Mage.Sets/src/mage/sets/ShardsOfAlara.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/SorinVsTibalt.java b/Mage.Sets/src/mage/sets/SorinVsTibalt.java index ab02721d53b..635a74fdaf2 100644 --- a/Mage.Sets/src/mage/sets/SorinVsTibalt.java +++ b/Mage.Sets/src/mage/sets/SorinVsTibalt.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/SpeedVsCunning.java b/Mage.Sets/src/mage/sets/SpeedVsCunning.java index 1acab45019e..e11b32024af 100644 --- a/Mage.Sets/src/mage/sets/SpeedVsCunning.java +++ b/Mage.Sets/src/mage/sets/SpeedVsCunning.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Starter1999.java b/Mage.Sets/src/mage/sets/Starter1999.java index d5c35548c1a..80b7a2dd6ab 100644 --- a/Mage.Sets/src/mage/sets/Starter1999.java +++ b/Mage.Sets/src/mage/sets/Starter1999.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Starter2000.java b/Mage.Sets/src/mage/sets/Starter2000.java index dbb0586a652..ddd3083ad7a 100644 --- a/Mage.Sets/src/mage/sets/Starter2000.java +++ b/Mage.Sets/src/mage/sets/Starter2000.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/SuperSeries.java b/Mage.Sets/src/mage/sets/SuperSeries.java index 9a72e7f0adf..81f06b1ba1a 100644 --- a/Mage.Sets/src/mage/sets/SuperSeries.java +++ b/Mage.Sets/src/mage/sets/SuperSeries.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/TempestRemastered.java b/Mage.Sets/src/mage/sets/TempestRemastered.java index 0c1745f0ae2..a42aad1c9da 100644 --- a/Mage.Sets/src/mage/sets/TempestRemastered.java +++ b/Mage.Sets/src/mage/sets/TempestRemastered.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/TenthEdition.java b/Mage.Sets/src/mage/sets/TenthEdition.java index 16277bfeae6..9c48b613ccf 100644 --- a/Mage.Sets/src/mage/sets/TenthEdition.java +++ b/Mage.Sets/src/mage/sets/TenthEdition.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.constants.SetType; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.constants.Rarity; -import mage.cards.CardGraphicInfo; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/TheDark.java b/Mage.Sets/src/mage/sets/TheDark.java index d96d9ac3e4a..8aa4a1ab4f7 100644 --- a/Mage.Sets/src/mage/sets/TheDark.java +++ b/Mage.Sets/src/mage/sets/TheDark.java @@ -28,8 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Theros.java b/Mage.Sets/src/mage/sets/Theros.java index 10968df1574..68763c07610 100644 --- a/Mage.Sets/src/mage/sets/Theros.java +++ b/Mage.Sets/src/mage/sets/Theros.java @@ -27,10 +27,10 @@ */ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/TimeSpiral.java b/Mage.Sets/src/mage/sets/TimeSpiral.java index 5bb019c62cd..53179022816 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiral.java +++ b/Mage.Sets/src/mage/sets/TimeSpiral.java @@ -1,13 +1,14 @@ package mage.sets; -import java.util.List; import mage.cards.Card; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardRepository; import mage.constants.Rarity; import mage.constants.SetType; -import mage.cards.CardGraphicInfo; + +import java.util.List; public class TimeSpiral extends ExpansionSet { diff --git a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java index fcd6214bcd6..1adcce1dfbc 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java +++ b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java @@ -27,11 +27,11 @@ */ package mage.sets; +import mage.cards.ExpansionSet; import mage.cards.i.IcatianJavelineers; import mage.cards.s.SwampMosquito; -import mage.constants.SetType; -import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/UginsFate.java b/Mage.Sets/src/mage/sets/UginsFate.java index 417a2e2883d..c5ec9788cf8 100644 --- a/Mage.Sets/src/mage/sets/UginsFate.java +++ b/Mage.Sets/src/mage/sets/UginsFate.java @@ -28,8 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Unglued.java b/Mage.Sets/src/mage/sets/Unglued.java index 83fd56458db..b775c77245c 100644 --- a/Mage.Sets/src/mage/sets/Unglued.java +++ b/Mage.Sets/src/mage/sets/Unglued.java @@ -1,11 +1,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; import mage.cards.FrameStyle; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Unhinged.java b/Mage.Sets/src/mage/sets/Unhinged.java index 9571281c872..efb8f262cd5 100644 --- a/Mage.Sets/src/mage/sets/Unhinged.java +++ b/Mage.Sets/src/mage/sets/Unhinged.java @@ -1,11 +1,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; - -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; import mage.cards.FrameStyle; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/UnlimitedEdition.java b/Mage.Sets/src/mage/sets/UnlimitedEdition.java index fcd252d29d7..d272b5c9124 100644 --- a/Mage.Sets/src/mage/sets/UnlimitedEdition.java +++ b/Mage.Sets/src/mage/sets/UnlimitedEdition.java @@ -1,9 +1,9 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/VenserVsKoth.java b/Mage.Sets/src/mage/sets/VenserVsKoth.java index aa6fdb52beb..b671974a5c6 100644 --- a/Mage.Sets/src/mage/sets/VenserVsKoth.java +++ b/Mage.Sets/src/mage/sets/VenserVsKoth.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/VintageMasters.java b/Mage.Sets/src/mage/sets/VintageMasters.java index 74905543cdb..b981d30bd7b 100644 --- a/Mage.Sets/src/mage/sets/VintageMasters.java +++ b/Mage.Sets/src/mage/sets/VintageMasters.java @@ -28,7 +28,6 @@ package mage.sets; -import java.util.List; import mage.cards.ExpansionSet; import mage.cards.h.HighTide; import mage.cards.h.HymnToTourach; @@ -38,6 +37,8 @@ import mage.cards.repository.CardRepository; import mage.constants.Rarity; import mage.constants.SetType; +import java.util.List; + /** * * @author LevelX2 diff --git a/Mage.Sets/src/mage/sets/WPNGateway.java b/Mage.Sets/src/mage/sets/WPNGateway.java index aef2cd535ac..1b52b21315f 100644 --- a/Mage.Sets/src/mage/sets/WPNGateway.java +++ b/Mage.Sets/src/mage/sets/WPNGateway.java @@ -5,10 +5,10 @@ */ package mage.sets; -import mage.cards.i.IcatianJavelineers; -import mage.constants.SetType; import mage.cards.ExpansionSet; +import mage.cards.i.IcatianJavelineers; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Weatherlight.java b/Mage.Sets/src/mage/sets/Weatherlight.java index 1507c4ad681..065500d14f4 100644 --- a/Mage.Sets/src/mage/sets/Weatherlight.java +++ b/Mage.Sets/src/mage/sets/Weatherlight.java @@ -28,10 +28,9 @@ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; - import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/WelcomeDeck2016.java b/Mage.Sets/src/mage/sets/WelcomeDeck2016.java index 5e12a55174c..33868299aab 100644 --- a/Mage.Sets/src/mage/sets/WelcomeDeck2016.java +++ b/Mage.Sets/src/mage/sets/WelcomeDeck2016.java @@ -29,8 +29,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java b/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java index 1a39a5a78a5..c37a71f21fc 100644 --- a/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java +++ b/Mage.Sets/src/mage/sets/WorldMagicCupQualifier.java @@ -28,9 +28,9 @@ package mage.sets; -import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/Zendikar.java b/Mage.Sets/src/mage/sets/Zendikar.java index be510378d15..68ff5481549 100644 --- a/Mage.Sets/src/mage/sets/Zendikar.java +++ b/Mage.Sets/src/mage/sets/Zendikar.java @@ -28,12 +28,12 @@ package mage.sets; -import mage.constants.SetType; -import mage.cards.ExpansionSet; -import mage.constants.Rarity; import mage.ObjectColor; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; import mage.cards.FrameStyle; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ZendikarExpeditions.java b/Mage.Sets/src/mage/sets/ZendikarExpeditions.java index 8df1a166251..002d5f4b485 100644 --- a/Mage.Sets/src/mage/sets/ZendikarExpeditions.java +++ b/Mage.Sets/src/mage/sets/ZendikarExpeditions.java @@ -28,8 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; -import mage.constants.SetType; import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java b/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java index 81ef015aa11..d53bd459a72 100644 --- a/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java +++ b/Mage.Sets/src/mage/sets/ZendikarVsEldrazi.java @@ -28,10 +28,10 @@ package mage.sets; -import mage.cards.ExpansionSet; -import mage.constants.SetType; -import mage.constants.Rarity; import mage.cards.CardGraphicInfo; +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; /** * diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java index bba2800208a..9586b31992f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java @@ -117,7 +117,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { Permanent lazav = getPermanent("Lazav, Dimir Mastermind", playerA.getId()); Assert.assertTrue(lazav.getAbilities().contains(FlyingAbility.getInstance())); Assert.assertTrue(lazav.getSubtype(currentGame).contains("Specter")); - Assert.assertTrue(lazav.getSupertype().contains("Legendary")); + Assert.assertTrue(lazav.isLegendary()); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPowerToughness(playerA, "Silvercoat Lion", 2, 2); @@ -147,7 +147,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { Permanent lazav = getPermanent("Lazav, Dimir Mastermind", playerA.getId()); Assert.assertTrue(lazav.getSubtype(currentGame).contains("Cat")); - Assert.assertTrue(lazav.getSupertype().contains("Legendary")); + Assert.assertTrue(lazav.isLegendary()); } /** diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index e28f3c99408..2a428e5485f 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -1,5 +1,12 @@ package mage.verify; +import mage.ObjectColor; +import mage.cards.*; +import mage.cards.basiclands.BasicLand; +import mage.constants.CardType; +import org.junit.Assert; +import org.junit.Test; + import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -8,17 +15,7 @@ import java.nio.file.Paths; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import mage.ObjectColor; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.ExpansionSet; -import mage.cards.Sets; -import mage.cards.SplitCard; -import mage.cards.basiclands.BasicLand; -import mage.constants.CardType; -import org.junit.Assert; -import org.junit.Test; +import java.util.stream.Collectors; public class VerifyCardDataTest { @@ -168,8 +165,8 @@ public class VerifyCardDataTest { private void checkSupertypes(Card card, JsonCard ref) { Collection expected = ref.supertypes; - if (!eqSet(card.getSupertype(), expected)) { - fail(card, "supertypes", card.getSupertype() + " != " + expected); + if (!eqSet(card.getSuperType().stream().map(s->s.toString()).collect(Collectors.toList()), expected)) { + fail(card, "supertypes", card.getSuperType() + " != " + expected); } } diff --git a/Mage/src/main/java/mage/MageObject.java b/Mage/src/main/java/mage/MageObject.java index 1bdbd40c95c..c41811d4f8c 100644 --- a/Mage/src/main/java/mage/MageObject.java +++ b/Mage/src/main/java/mage/MageObject.java @@ -1,19 +1,20 @@ package mage; -import java.io.Serializable; -import java.util.EnumSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.abilities.Abilities; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCosts; import mage.cards.FrameStyle; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.events.ZoneChangeEvent; +import java.io.Serializable; +import java.util.EnumSet; +import java.util.List; +import java.util.UUID; + public interface MageObject extends MageItem, Serializable { String getName(); @@ -32,16 +33,16 @@ public interface MageObject extends MageItem, Serializable { boolean hasSubtype(String subtype, Game game); - List getSupertype(); + EnumSet getSuperType(); Abilities getAbilities(); boolean hasAbility(UUID abilityId, Game game); ObjectColor getColor(Game game); - + ObjectColor getFrameColor(Game game); - + FrameStyle getFrameStyle(); ManaCosts getManaCost(); @@ -51,10 +52,9 @@ public interface MageObject extends MageItem, Serializable { MageInt getPower(); MageInt getToughness(); - + int getStartingLoyalty(); - - + void adjustCosts(Ability ability, Game game); @@ -83,33 +83,53 @@ public interface MageObject extends MageItem, Serializable { void setZoneChangeCounter(int value, Game game); - - default boolean isCreature(){ + default boolean isCreature() { return getCardType().contains(CardType.CREATURE); } - default boolean isArtifact(){ + default boolean isArtifact() { return getCardType().contains(CardType.ARTIFACT); } - default boolean isLand(){ + default boolean isLand() { return getCardType().contains(CardType.LAND); } - default boolean isEnchantment(){ + default boolean isEnchantment() { return getCardType().contains(CardType.ENCHANTMENT); } - default boolean isInstant(){ + default boolean isInstant() { return getCardType().contains(CardType.INSTANT); } - default boolean isSorcery(){ + default boolean isSorcery() { return getCardType().contains(CardType.SORCERY); } - default boolean isPlaneswalker(){ + default boolean isPlaneswalker() { return getCardType().contains(CardType.PLANESWALKER); } + default boolean isPermanent() { + return isCreature() || isArtifact() || isPlaneswalker() || isEnchantment() || isLand(); + } + + default boolean isLegendary() { + return getSuperType().contains(SuperType.LEGENDARY); + } + + default boolean isSnow() { + return getSuperType().contains(SuperType.SNOW); + } + + default void addSuperType(SuperType superType){ + getSuperType().add(superType); + } + + default boolean isBasic() { return getSuperType().contains(SuperType.BASIC);} + + default boolean isWorld() { + return getSuperType().contains(SuperType.WORLD); + } } diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index 0b21654437b..ff3c659be98 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.ChangelingAbility; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.FrameStyle; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.events.ZoneChangeEvent; import mage.util.CardUtil; @@ -56,7 +57,7 @@ public abstract class MageObjectImpl implements MageObject { protected FrameStyle frameStyle; protected EnumSet cardType = EnumSet.noneOf(CardType.class); protected List subtype = new ArrayList<>(); - protected List supertype = new ArrayList<>(); + protected EnumSet supertype = EnumSet.noneOf(SuperType.class); protected Abilities abilities; protected String text; protected MageInt power; @@ -91,7 +92,7 @@ public abstract class MageObjectImpl implements MageObject { abilities = object.abilities.copy(); this.cardType.addAll(object.cardType); this.subtype.addAll(object.subtype); - this.supertype.addAll(object.supertype); + supertype.addAll(object.supertype); this.copy = object.copy; } @@ -136,7 +137,7 @@ public abstract class MageObjectImpl implements MageObject { } @Override - public List getSupertype() { + public EnumSet getSuperType() { return supertype; } diff --git a/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java index b624f9f25a4..99103decd71 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java @@ -29,10 +29,13 @@ package mage.abilities.condition.common; import mage.abilities.Ability; import mage.abilities.condition.Condition; +import mage.constants.SuperType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.EnumSet; + /** * * @author LevelX2 @@ -40,15 +43,15 @@ import mage.game.permanent.Permanent; public class EquippedHasSupertypeCondition implements Condition { - private String superType; - private String[] superTypes; // scope = Any + private SuperType superType; + private EnumSet superTypes = EnumSet.noneOf(SuperType.class); // scope = Any - public EquippedHasSupertypeCondition(String subType) { - this.superType = subType; + public EquippedHasSupertypeCondition(SuperType supertype) { + this.superType = supertype; } - public EquippedHasSupertypeCondition(String... subTypes) { - this.superTypes = subTypes; + public EquippedHasSupertypeCondition(EnumSet superTypes) { + this.superTypes = superTypes; } @Override @@ -61,12 +64,12 @@ public class EquippedHasSupertypeCondition implements Condition { } if (attachedTo != null) { if (superType != null) { - if (attachedTo.getSupertype().contains(this.superType)) { + if (attachedTo.getSuperType().contains(this.superType)) { return true; } } else { - for (String s : superTypes) { - if (attachedTo.getSupertype().contains(s)) { + for (SuperType s : superTypes) { + if (attachedTo.getSuperType().contains(s)) { return true; } } diff --git a/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java index b5e119a5fa6..2b88104394f 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java @@ -31,6 +31,7 @@ import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.constants.ColoredManaSymbol; +import mage.constants.SuperType; import mage.filter.FilterObject; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; @@ -41,7 +42,7 @@ public class SnowManaCost extends ManaCostImpl { private static final FilterObject filter = new FilterObject("Snow object"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public SnowManaCost() { diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java index 5e689fc6755..3ad75b5da4d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java @@ -33,13 +33,7 @@ import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; -import mage.constants.AbilityType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentCard; @@ -134,9 +128,9 @@ public class CopyEffect extends ContinuousEffectImpl { for (String type : copyFromObject.getSubtype(game)) { permanent.getSubtype(game).add(type); } - permanent.getSupertype().clear(); - for (String type : copyFromObject.getSupertype()) { - permanent.getSupertype().add(type); + permanent.getSuperType().clear(); + for (SuperType type : copyFromObject.getSuperType()) { + permanent.getSuperType().add(type); } permanent.removeAllAbilities(source.getSourceId(), game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java index 60f09fb7d17..3aa3ba8a9e8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java @@ -2,11 +2,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; @@ -38,9 +34,9 @@ public class CopyTokenEffect extends ContinuousEffectImpl { for (String type: token.getSubtype(game)) { permanent.getSubtype(game).add(type); } - permanent.getSupertype().clear(); - for (String type: token.getSupertype()) { - permanent.getSupertype().add(type); + permanent.getSuperType().clear(); + for (SuperType type: token.getSuperType()) { + permanent.getSuperType().add(type); } permanent.getAbilities().clear(); for (Ability ability: token.getAbilities()) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java index 3c08e0d3180..ca214044a8a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java @@ -30,11 +30,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.repository.CardRepository; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; @@ -85,10 +81,9 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - for (String t : token.getSupertype()) { - if (!permanent.getSupertype().contains(t)) { - permanent.getSupertype().add(t); - } + for (SuperType t : token.getSuperType()) { + permanent.addSuperType(t); + } // card type switch (loseType) { @@ -167,9 +162,9 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { @Override public boolean hasLayer(Layer layer) { - return layer == Layer.PTChangingEffects_7 - || layer == Layer.AbilityAddingRemovingEffects_6 - || layer == Layer.ColorChangingEffects_5 + return layer == Layer.PTChangingEffects_7 + || layer == Layer.AbilityAddingRemovingEffects_6 + || layer == Layer.ColorChangingEffects_5 || layer == Layer.TypeChangingEffects_4; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java index 125313b4472..88e921758da 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java @@ -107,7 +107,7 @@ public class BecomesFaceDownCreatureAllEffect extends ContinuousEffectImpl imple switch (layer) { case TypeChangingEffects_4: permanent.setName(""); - permanent.getSupertype().clear(); + permanent.getSuperType().clear(); permanent.getCardType().clear(); permanent.getCardType().add(CardType.CREATURE); permanent.getSubtype(game).clear(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java index bd04bd6eaa8..f71868632ff 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java @@ -163,7 +163,7 @@ public class BecomesFaceDownCreatureEffect extends ContinuousEffectImpl implemen switch (layer) { case TypeChangingEffects_4: permanent.setName(""); - permanent.getSupertype().clear(); + permanent.getSuperType().clear(); permanent.getCardType().clear(); permanent.getCardType().add(CardType.CREATURE); permanent.getSubtype(game).clear(); diff --git a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java index 5a81ae7d193..587aa53c93e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java @@ -301,7 +301,7 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost mageObject.getCardType().clear(); mageObject.getCardType().add(CardType.CREATURE); mageObject.getSubtype(null).clear(); - mageObject.getSupertype().clear(); + mageObject.getSuperType().clear(); mageObject.getManaCost().clear(); if (mageObject instanceof Permanent) { ((Permanent) mageObject).setExpansionSetCode(""); diff --git a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java index d9110c7a06b..e365e6dd287 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java @@ -83,9 +83,9 @@ public class TransformAbility extends SimpleStaticAbility { for (String type : sourceCard.getSubtype(game)) { permanent.getSubtype(game).add(type); } - permanent.getSupertype().clear(); - for (String type : sourceCard.getSupertype()) { - permanent.getSupertype().add(type); + permanent.getSuperType().clear(); + for (SuperType type : sourceCard.getSuperType()) { + permanent.getSuperType().add(type); } permanent.setExpansionSetCode(sourceCard.getExpansionSetCode()); permanent.getAbilities().clear(); diff --git a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java index b83da192632..b4b76bac543 100644 --- a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java +++ b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java @@ -34,16 +34,16 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.CardImpl; +import mage.constants.SuperType; /** - * * @author BetaSteward_at_googlemail.com */ public abstract class BasicLand extends CardImpl { public BasicLand(UUID ownerId, CardSetInfo setInfo, ActivatedManaAbilityImpl mana) { super(ownerId, setInfo, new CardType[]{CardType.LAND}, null); - this.supertype.add("Basic"); + addSuperType(SuperType.BASIC); this.subtype.add(name); this.addAbility(mana); } diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java index 139f2b32485..e63c7d5b1b4 100644 --- a/Mage/src/main/java/mage/cards/repository/CardInfo.java +++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java @@ -47,10 +47,10 @@ import mage.cards.mock.MockSplitCard; import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.SpellAbilityType; +import mage.constants.SuperType; import org.apache.log4j.Logger; /** - * * @author North */ @DatabaseTable(tableName = "card") @@ -153,7 +153,7 @@ public class CardInfo { this.setTypes(card.getCardType()); this.setSubtypes(card.getSubtype(null)); - this.setSuperTypes(card.getSupertype()); + this.setSuperTypes(card.getSuperType()); this.setManaCosts(card.getManaCost().getSymbols()); int length = 0; @@ -249,6 +249,7 @@ public class CardInfo { if (list.isEmpty()) { return Collections.emptyList(); } + return Arrays.asList(list.split(SEPARATOR)); } @@ -311,12 +312,23 @@ public class CardInfo { this.subtypes = joinList(subtypes); } - public final List getSupertypes() { - return parseList(supertypes); + public final EnumSet getSupertypes() { + EnumSet list = EnumSet.noneOf(SuperType.class); + for (String type : this.types.split(SEPARATOR)) { + try { + list.add(SuperType.valueOf(type)); + } catch (IllegalArgumentException e) { + } + } + return list; } - public final void setSuperTypes(List superTypes) { - this.supertypes = joinList(superTypes); + public final void setSuperTypes(Set superTypes) { + StringBuilder sb = new StringBuilder(); + for (SuperType item : superTypes) { + sb.append(item.name()).append(SEPARATOR); + } + this.supertypes = sb.toString(); } public String getToughness() { diff --git a/Mage/src/main/java/mage/constants/SuperType.java b/Mage/src/main/java/mage/constants/SuperType.java index 209ef2f789e..c57126a78b2 100644 --- a/Mage/src/main/java/mage/constants/SuperType.java +++ b/Mage/src/main/java/mage/constants/SuperType.java @@ -4,4 +4,12 @@ package mage.constants; * Created by IGOUDT on 26-3-2017. */ public enum SuperType { + + BASIC, + ELITE, + LEGENDARY, + ONGOING, + SNOW, + WORLD + } diff --git a/Mage/src/main/java/mage/designations/Designation.java b/Mage/src/main/java/mage/designations/Designation.java index 5792e2b52f2..856c0f2e607 100644 --- a/Mage/src/main/java/mage/designations/Designation.java +++ b/Mage/src/main/java/mage/designations/Designation.java @@ -18,6 +18,7 @@ import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; import mage.cards.FrameStyle; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.events.ZoneChangeEvent; import mage.util.GameLog; @@ -31,7 +32,7 @@ public abstract class Designation implements MageObject { private static EnumSet emptySet = EnumSet.noneOf(CardType.class); private static List emptyList = new ArrayList(); private static ObjectColor emptyColor = new ObjectColor(); - private static ManaCosts emptyCost = new ManaCostsImpl(); + private static ManaCostsImpl emptyCost = new ManaCostsImpl(); private String name; private UUID id; @@ -133,8 +134,8 @@ public abstract class Designation implements MageObject { } @Override - public List getSupertype() { - return emptyList; + public EnumSet getSuperType() { + return EnumSet.noneOf(SuperType.class); } @Override diff --git a/Mage/src/main/java/mage/filter/common/FilterBasicLandCard.java b/Mage/src/main/java/mage/filter/common/FilterBasicLandCard.java index 9c4a4dc52c0..2dd3e81b43e 100644 --- a/Mage/src/main/java/mage/filter/common/FilterBasicLandCard.java +++ b/Mage/src/main/java/mage/filter/common/FilterBasicLandCard.java @@ -28,6 +28,7 @@ package mage.filter.common; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -45,7 +46,7 @@ public class FilterBasicLandCard extends FilterCard { public FilterBasicLandCard(String name) { super(name); this.add(new CardTypePredicate(CardType.LAND)); - this.add(new SupertypePredicate("Basic")); + this.add(new SupertypePredicate(SuperType.BASIC)); } public FilterBasicLandCard(final FilterBasicLandCard filter) { diff --git a/Mage/src/main/java/mage/filter/common/FilterLandCard.java b/Mage/src/main/java/mage/filter/common/FilterLandCard.java index 0d6525cc427..b56d74fef4b 100644 --- a/Mage/src/main/java/mage/filter/common/FilterLandCard.java +++ b/Mage/src/main/java/mage/filter/common/FilterLandCard.java @@ -29,6 +29,7 @@ package mage.filter.common; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -50,7 +51,7 @@ public class FilterLandCard extends FilterCard { public static FilterLandCard basicLandCard() { FilterLandCard filter = new FilterLandCard("basic land card"); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); return filter; } diff --git a/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java b/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java index 1c35a2e11f5..5bac9141100 100644 --- a/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java @@ -29,6 +29,7 @@ package mage.filter.common; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -57,13 +58,13 @@ public class FilterLandPermanent extends FilterPermanent { public static FilterLandPermanent nonbasicLand() { FilterLandPermanent filter = new FilterLandPermanent("nonbasic land"); - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); return filter; } public static FilterLandPermanent nonbasicLands() { FilterLandPermanent filter = new FilterLandPermanent("nonbasic lands"); - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); return filter; } diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java index e787b6a6687..59d94f41fc0 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java @@ -28,6 +28,7 @@ package mage.filter.predicate.mageobject; import mage.MageObject; +import mage.constants.SuperType; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -37,15 +38,19 @@ import mage.game.Game; */ public class SupertypePredicate implements Predicate { - private final String supertype; + private final SuperType supertype; - public SupertypePredicate(String supertype) { + public SupertypePredicate(SuperType supertype) { this.supertype = supertype; } + public SupertypePredicate(String supertype){ + this.supertype = SuperType.valueOf(supertype.trim().toUpperCase()); + } + @Override public boolean apply(MageObject input, Game game) { - return input.getSupertype().contains(supertype); + return input.getSuperType().contains(supertype); } @Override diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index cd955996c95..9db038eb1fb 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -118,7 +118,7 @@ public abstract class GameImpl implements Game, Serializable { FILTER_FORTIFICATION.add(new CardTypePredicate(CardType.ARTIFACT)); FILTER_FORTIFICATION.add(new SubtypePredicate("Fortification")); - FILTER_LEGENDARY.add(new SupertypePredicate("Legendary")); + FILTER_LEGENDARY.add(new SupertypePredicate(SuperType.LEGENDARY)); } private transient Object customData; @@ -1733,7 +1733,7 @@ public abstract class GameImpl implements Game, Serializable { } planeswalkers.add(perm); } - if (perm.getSupertype().contains("World")) { + if (perm.isWorld()) { worldEnchantment.add(perm); } if (FILTER_AURA.match(perm, this)) { @@ -1931,7 +1931,7 @@ public abstract class GameImpl implements Game, Serializable { if (legendary.size() > 1) { //don't bother checking if less than 2 legends in play for (Permanent legend : legendary) { FilterPermanent filterLegendName = new FilterPermanent(); - filterLegendName.add(new SupertypePredicate("Legendary")); + filterLegendName.add(new SupertypePredicate(SuperType.LEGENDARY)); filterLegendName.add(new NamePredicate(legend.getName())); filterLegendName.add(new ControllerIdPredicate(legend.getControllerId())); if (getBattlefield().contains(filterLegendName, legend.getControllerId(), this, 2)) { diff --git a/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java b/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java index 70038ac6431..95cc851ec8f 100644 --- a/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java +++ b/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java @@ -41,12 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import mage.constants.CardType; -import mage.constants.MultiplayerAttackOption; -import mage.constants.PhaseStep; -import mage.constants.RangeOfInfluence; -import mage.constants.Rarity; -import mage.constants.Zone; +import mage.constants.*; import mage.game.turn.TurnMod; import mage.players.Player; import mage.watchers.common.CommanderInfoWatcher; @@ -166,7 +161,7 @@ class DefaultCommander extends CardImpl { public DefaultCommander(UUID ownerId, String commanderName, String manaString) { super(ownerId, new CardSetInfo(commanderName, "", "999", Rarity.RARE), new CardType[]{CardType.CREATURE}, manaString); - this.supertype.add("Legendary"); + this.addSuperType(SuperType.LEGENDARY); if (manaString.contains("{G}")) { this.color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/command/Commander.java b/Mage/src/main/java/mage/game/command/Commander.java index 4d8cdb7e873..e267302b3dc 100644 --- a/Mage/src/main/java/mage/game/command/Commander.java +++ b/Mage/src/main/java/mage/game/command/Commander.java @@ -43,6 +43,7 @@ import mage.abilities.costs.mana.ManaCosts; import mage.cards.Card; import mage.cards.FrameStyle; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.events.ZoneChangeEvent; import mage.util.GameLog; @@ -127,8 +128,8 @@ public class Commander implements CommandObject { } @Override - public List getSupertype() { - return sourceObject.getSupertype(); + public EnumSet getSuperType() { + return sourceObject.getSuperType(); } @Override diff --git a/Mage/src/main/java/mage/game/command/Emblem.java b/Mage/src/main/java/mage/game/command/Emblem.java index c49c1f28d47..997cfa291d4 100644 --- a/Mage/src/main/java/mage/game/command/Emblem.java +++ b/Mage/src/main/java/mage/game/command/Emblem.java @@ -41,6 +41,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.cards.Card; import mage.cards.FrameStyle; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.events.ZoneChangeEvent; import mage.util.GameLog; @@ -163,8 +164,8 @@ public class Emblem implements CommandObject { } @Override - public List getSupertype() { - return emptyList; + public EnumSet getSuperType() { + return EnumSet.noneOf(SuperType.class); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/PermanentCard.java b/Mage/src/main/java/mage/game/permanent/PermanentCard.java index c3ff27de593..ee81057b952 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentCard.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentCard.java @@ -125,7 +125,7 @@ public class PermanentCard extends PermanentImpl { this.subtype.clear(); this.subtype.addAll(card.getSubtype(game)); this.supertype.clear(); - this.supertype.addAll(card.getSupertype()); + supertype.addAll(card.getSuperType()); this.expansionSetCode = card.getExpansionSetCode(); this.rarity = card.getRarity(); this.cardNumber = card.getCardNumber(); diff --git a/Mage/src/main/java/mage/game/permanent/PermanentToken.java b/Mage/src/main/java/mage/game/permanent/PermanentToken.java index c190345d9a1..a04927c6c63 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentToken.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentToken.java @@ -88,7 +88,7 @@ public class PermanentToken extends PermanentImpl { this.color = token.getColor(game).copy(); this.frameColor = token.getFrameColor(game); this.frameStyle = token.getFrameStyle(); - this.supertype = token.getSupertype(); + this.supertype = token.getSuperType(); this.subtype = token.getSubtype(game); this.tokenDescriptor = token.getTokenDescriptor(); } diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java index df7753c6425..777bc0a9adc 100644 --- a/Mage/src/main/java/mage/game/stack/Spell.java +++ b/Mage/src/main/java/mage/game/stack/Spell.java @@ -27,10 +27,8 @@ */ package mage.game.stack; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.UUID; +import java.util.*; + import mage.MageInt; import mage.MageObject; import mage.Mana; @@ -49,12 +47,7 @@ import mage.cards.Card; import mage.cards.CardsImpl; import mage.cards.FrameStyle; import mage.cards.SplitCard; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.SpellAbilityType; -import mage.constants.Zone; -import mage.constants.ZoneDetail; +import mage.constants.*; import mage.counters.Counter; import mage.counters.Counters; import mage.game.Game; @@ -499,8 +492,8 @@ public class Spell extends StackObjImpl implements Card { } @Override - public List getSupertype() { - return card.getSupertype(); + public EnumSet getSuperType() { + return card.getSuperType(); } public List getSpellAbilities() { diff --git a/Mage/src/main/java/mage/game/stack/StackAbility.java b/Mage/src/main/java/mage/game/stack/StackAbility.java index cc2dad58aae..6be75a0a11f 100644 --- a/Mage/src/main/java/mage/game/stack/StackAbility.java +++ b/Mage/src/main/java/mage/game/stack/StackAbility.java @@ -49,13 +49,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; import mage.cards.Card; import mage.cards.FrameStyle; -import mage.constants.AbilityType; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.EffectType; -import mage.constants.Outcome; -import mage.constants.Zone; -import mage.constants.ZoneDetail; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -174,8 +168,8 @@ public class StackAbility extends StackObjImpl implements Ability { } @Override - public List getSupertype() { - return emptyString; + public EnumSet getSuperType() { + return EnumSet.noneOf(SuperType.class); } @Override diff --git a/Mage/src/main/java/mage/target/common/TargetBasicLandCard.java b/Mage/src/main/java/mage/target/common/TargetBasicLandCard.java index 2af22ab828c..2b835766515 100644 --- a/Mage/src/main/java/mage/target/common/TargetBasicLandCard.java +++ b/Mage/src/main/java/mage/target/common/TargetBasicLandCard.java @@ -29,6 +29,7 @@ package mage.target.common; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -42,7 +43,7 @@ public class TargetBasicLandCard extends TargetCard { public TargetBasicLandCard(Zone zone) { super(zone); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(new CardTypePredicate(CardType.LAND)); } diff --git a/Mage/src/main/java/mage/target/common/TargetNonBasicLandPermanent.java b/Mage/src/main/java/mage/target/common/TargetNonBasicLandPermanent.java index c99cca7faaf..fed264a6541 100644 --- a/Mage/src/main/java/mage/target/common/TargetNonBasicLandPermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetNonBasicLandPermanent.java @@ -28,6 +28,7 @@ package mage.target.common; +import mage.constants.SuperType; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -38,7 +39,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate; public class TargetNonBasicLandPermanent extends TargetLandPermanent { public TargetNonBasicLandPermanent() { - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); this.targetName = "nonbasic land"; } diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 1f824625e11..baecd62ca63 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -414,18 +414,6 @@ public final class CardUtil { return new CopyTokenFunction(target); } - public static boolean isPermanentCard(Card card) { - boolean permanent = false; - - permanent |= card.isArtifact(); - permanent |= card.isCreature(); - permanent |= card.isEnchantment(); - permanent |= card.isLand(); - permanent |= card.isPlaneswalker(); - - return permanent; - } - /** * Converts an integer number to string Numbers > 20 will be returned as * digits diff --git a/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java index d6e9c2e91b7..373e573f8f8 100644 --- a/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java +++ b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java @@ -32,6 +32,7 @@ import mage.abilities.Ability; import mage.abilities.keyword.MorphAbility; import mage.cards.Card; import mage.constants.CardType; +import mage.constants.SuperType; import mage.game.permanent.PermanentCard; import mage.game.permanent.PermanentToken; import mage.game.permanent.token.Token; @@ -98,9 +99,9 @@ public class CopyTokenFunction implements Function { for (String type : sourceObj.getSubtype(null)) { target.getSubtype(null).add(type); } - target.getSupertype().clear(); - for (String type : sourceObj.getSupertype()) { - target.getSupertype().add(type); + target.getSuperType().clear(); + for (SuperType type : sourceObj.getSuperType()) { + target.getSuperType().add(type); } target.getAbilities().clear(); diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl index 923424fd1f1..3f9629413e6 100755 --- a/Utils/gen-card.pl +++ b/Utils/gen-card.pl @@ -180,7 +180,7 @@ while ($type =~ m/([a-zA-Z]+)( )*/g) { if (@types) { $vars{'subType'} .= "\n this.subtype.add(\"$1\");"; } else { - $vars{'subType'} .= "\n this.supertype.add(\"$1\");"; + $vars{'subType'} .= "\n addSuperType(\"$1\");"; } } } diff --git a/Utils/gen_types_list.pl b/Utils/gen_types_list.pl index c85d86a94c8..c4ad0aa8a87 100644 --- a/Utils/gen_types_list.pl +++ b/Utils/gen_types_list.pl @@ -37,7 +37,7 @@ while () $types{$1}++; $types_files{$1} .= $file . ",,,"; } - if ($line =~ m/this.supertype.add.*"([^"]*)"/) + if ($line =~ m/addSuperType.*"([^"]*)"/) { $types{$1}++; $types_files{$1} .= $file . ",,,";