diff --git a/Mage/src/main/java/mage/ConditionalMana.java b/Mage/src/main/java/mage/ConditionalMana.java index 86a378e12ae..41432c828a8 100644 --- a/Mage/src/main/java/mage/ConditionalMana.java +++ b/Mage/src/main/java/mage/ConditionalMana.java @@ -1,5 +1,10 @@ package mage; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; @@ -9,11 +14,6 @@ import mage.filter.Filter; import mage.filter.FilterMana; import mage.game.Game; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/MageInt.java b/Mage/src/main/java/mage/MageInt.java index 9507918a8cc..3f1fc8652d1 100644 --- a/Mage/src/main/java/mage/MageInt.java +++ b/Mage/src/main/java/mage/MageInt.java @@ -1,11 +1,11 @@ package mage; -import mage.util.CardUtil; -import mage.util.Copyable; - import java.io.Serializable; import java.util.Objects; +import mage.util.CardUtil; +import mage.util.Copyable; + public class MageInt implements Serializable, Copyable { public static final MageInt EmptyMageInt = new MageInt(Integer.MIN_VALUE, "") { diff --git a/Mage/src/main/java/mage/MageObject.java b/Mage/src/main/java/mage/MageObject.java index 744ec43f071..b840f0bac72 100644 --- a/Mage/src/main/java/mage/MageObject.java +++ b/Mage/src/main/java/mage/MageObject.java @@ -1,5 +1,10 @@ package mage; +import java.io.Serializable; +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; @@ -15,12 +20,6 @@ import mage.game.Game; import mage.game.events.ZoneChangeEvent; import mage.util.SubTypeList; -import java.io.Serializable; -import java.util.EnumSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; - public interface MageObject extends MageItem, Serializable { String getName(); diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index b68592bb6b1..c526e944391 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -1,5 +1,12 @@ package mage; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; @@ -14,15 +21,17 @@ import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.abilities.text.TextPart; import mage.abilities.text.TextPartSubType; import mage.cards.FrameStyle; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.SubTypeSet; +import mage.constants.SuperType; import mage.game.Game; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.util.GameLog; import mage.util.SubTypeList; -import java.util.*; - public abstract class MageObjectImpl implements MageObject { protected UUID objectId; diff --git a/Mage/src/main/java/mage/MageObjectReference.java b/Mage/src/main/java/mage/MageObjectReference.java index a4f2a81302f..47720d1f21b 100644 --- a/Mage/src/main/java/mage/MageObjectReference.java +++ b/Mage/src/main/java/mage/MageObjectReference.java @@ -1,15 +1,16 @@ package mage; +import java.io.Serializable; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.cards.Card; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.game.stack.StackObject; -import org.apache.log4j.Logger; - -import java.io.Serializable; -import java.util.UUID; /** * A object reference that takes zone changes into account. diff --git a/Mage/src/main/java/mage/Mana.java b/Mage/src/main/java/mage/Mana.java index f6a594292fb..5a8d9a86d0f 100644 --- a/Mage/src/main/java/mage/Mana.java +++ b/Mage/src/main/java/mage/Mana.java @@ -2,11 +2,13 @@ package mage; import java.io.Serializable; import java.util.Objects; + +import org.apache.log4j.Logger; + import mage.constants.ColoredManaSymbol; import mage.constants.ManaType; import mage.filter.FilterMana; import mage.util.Copyable; -import org.apache.log4j.Logger; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/Abilities.java b/Mage/src/main/java/mage/abilities/Abilities.java index 0d1000d1720..7100e91bf83 100644 --- a/Mage/src/main/java/mage/abilities/Abilities.java +++ b/Mage/src/main/java/mage/abilities/Abilities.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; import java.util.Optional; import java.util.UUID; + import mage.abilities.keyword.ProtectionAbility; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java index d389a5ac155..3c2a6b99843 100644 --- a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java @@ -1,5 +1,16 @@ package mage.abilities; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; + +import org.apache.log4j.Logger; + import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.keyword.ProtectionAbility; @@ -8,10 +19,6 @@ import mage.constants.AbilityType; import mage.constants.Zone; import mage.game.Game; import mage.util.ThreadLocalStringBuilder; -import org.apache.log4j.Logger; - -import java.util.*; -import java.util.stream.Collectors; /** * @param diff --git a/Mage/src/main/java/mage/abilities/Ability.java b/Mage/src/main/java/mage/abilities/Ability.java index dd5b811f84f..b232159b3a4 100644 --- a/Mage/src/main/java/mage/abilities/Ability.java +++ b/Mage/src/main/java/mage/abilities/Ability.java @@ -1,5 +1,9 @@ package mage.abilities; +import java.io.Serializable; +import java.util.List; +import java.util.UUID; + import mage.MageObject; import mage.abilities.costs.Cost; import mage.abilities.costs.CostAdjuster; @@ -9,7 +13,11 @@ import mage.abilities.costs.mana.ManaCosts; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; import mage.abilities.hint.Hint; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.AbilityWord; +import mage.constants.EffectType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Controllable; import mage.game.Game; import mage.game.events.GameEvent; @@ -20,10 +28,6 @@ import mage.target.Targets; import mage.target.targetadjustment.TargetAdjuster; import mage.watchers.Watcher; -import java.io.Serializable; -import java.util.List; -import java.util.UUID; - /** * Practically everything in the game is started from an Ability. This interface * describes what an Ability is composed of at the highest level. diff --git a/Mage/src/main/java/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java index 7fcb21e585b..bb74a6594ca 100644 --- a/Mage/src/main/java/mage/abilities/AbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java @@ -1,9 +1,26 @@ package mage.abilities; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.MageObject; -import mage.abilities.costs.*; +import mage.abilities.costs.AlternativeSourceCosts; +import mage.abilities.costs.Cost; +import mage.abilities.costs.CostAdjuster; +import mage.abilities.costs.Costs; +import mage.abilities.costs.CostsImpl; +import mage.abilities.costs.OptionalAdditionalSourceCosts; +import mage.abilities.costs.VariableCost; import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.costs.mana.*; +import mage.abilities.costs.mana.ManaCost; +import mage.abilities.costs.mana.ManaCosts; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.costs.mana.PhyrexianManaCost; +import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; @@ -12,7 +29,12 @@ import mage.abilities.hint.Hint; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.Card; import mage.cards.SplitCard; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.AbilityWord; +import mage.constants.EffectType; +import mage.constants.Outcome; +import mage.constants.SpellAbilityType; +import mage.constants.Zone; import mage.game.Game; import mage.game.command.Emblem; import mage.game.command.Plane; @@ -27,12 +49,6 @@ import mage.target.targetadjustment.TargetAdjuster; import mage.util.GameLog; import mage.util.ThreadLocalStringBuilder; import mage.watchers.Watcher; -import org.apache.log4j.Logger; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/ActivatedAbility.java b/Mage/src/main/java/mage/abilities/ActivatedAbility.java index 4601964969b..4385ee3ae80 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbility.java @@ -1,6 +1,7 @@ package mage.abilities; import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.mana.ManaOptions; import mage.constants.TargetController; diff --git a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java index d54e2f27eb9..f2477ce7d3a 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java @@ -1,6 +1,7 @@ package mage.abilities; import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.condition.Condition; diff --git a/Mage/src/main/java/mage/abilities/ActivationInfo.java b/Mage/src/main/java/mage/abilities/ActivationInfo.java index bed1acb2fec..f59a15fce4c 100644 --- a/Mage/src/main/java/mage/abilities/ActivationInfo.java +++ b/Mage/src/main/java/mage/abilities/ActivationInfo.java @@ -2,6 +2,7 @@ package mage.abilities; import java.util.UUID; + import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/abilities/DelayedTriggeredAbilities.java b/Mage/src/main/java/mage/abilities/DelayedTriggeredAbilities.java index c1d4d0e7f01..bf86a4cc404 100644 --- a/Mage/src/main/java/mage/abilities/DelayedTriggeredAbilities.java +++ b/Mage/src/main/java/mage/abilities/DelayedTriggeredAbilities.java @@ -1,11 +1,11 @@ package mage.abilities; +import java.util.Iterator; + import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; -import java.util.Iterator; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/Mode.java b/Mage/src/main/java/mage/abilities/Mode.java index 2acae731419..5140033aebe 100644 --- a/Mage/src/main/java/mage/abilities/Mode.java +++ b/Mage/src/main/java/mage/abilities/Mode.java @@ -1,13 +1,13 @@ package mage.abilities; +import java.io.Serializable; +import java.util.UUID; + import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; import mage.target.Target; import mage.target.Targets; -import java.io.Serializable; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/Modes.java b/Mage/src/main/java/mage/abilities/Modes.java index f05cb990d96..3eb1254d6fb 100644 --- a/Mage/src/main/java/mage/abilities/Modes.java +++ b/Mage/src/main/java/mage/abilities/Modes.java @@ -1,5 +1,13 @@ package mage.abilities; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + import mage.abilities.costs.OptionalAdditionalModeSourceCosts; import mage.cards.Card; import mage.constants.Outcome; @@ -11,8 +19,6 @@ import mage.players.Player; import mage.target.common.TargetOpponent; import mage.util.RandomUtil; -import java.util.*; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/PlayLandAbility.java b/Mage/src/main/java/mage/abilities/PlayLandAbility.java index 4fc440012e3..15c685e76db 100644 --- a/Mage/src/main/java/mage/abilities/PlayLandAbility.java +++ b/Mage/src/main/java/mage/abilities/PlayLandAbility.java @@ -1,6 +1,7 @@ package mage.abilities; import java.util.UUID; + import mage.MageObjectReference; import mage.constants.AbilityType; import mage.constants.AsThoughEffectType; diff --git a/Mage/src/main/java/mage/abilities/SpellAbility.java b/Mage/src/main/java/mage/abilities/SpellAbility.java index 9bd506f34a6..2e4ec219ac5 100644 --- a/Mage/src/main/java/mage/abilities/SpellAbility.java +++ b/Mage/src/main/java/mage/abilities/SpellAbility.java @@ -2,6 +2,7 @@ package mage.abilities; import java.util.Optional; import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.costs.Cost; @@ -11,7 +12,12 @@ import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.keyword.FlashAbility; import mage.cards.Card; import mage.cards.SplitCard; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.AsThoughEffectType; +import mage.constants.SpellAbilityCastMode; +import mage.constants.SpellAbilityType; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; diff --git a/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java b/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java index ae45a834e8d..a56d1d6da3c 100644 --- a/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java @@ -1,12 +1,12 @@ package mage.abilities; +import java.util.UUID; + import mage.abilities.effects.Effect; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java index d354a44835a..e729d8008d4 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java @@ -2,8 +2,14 @@ package mage.abilities; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; + import mage.MageObject; import mage.constants.Zone; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbility.java b/Mage/src/main/java/mage/abilities/TriggeredAbility.java index 516861ec3bc..afef0620caf 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbility.java @@ -2,6 +2,7 @@ package mage.abilities; import java.util.UUID; + import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java index e0374619982..2984669a4ba 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java @@ -1,5 +1,8 @@ package mage.abilities; +import java.util.Locale; +import java.util.UUID; + import mage.MageObject; import mage.abilities.effects.Effect; import mage.constants.AbilityType; @@ -11,9 +14,6 @@ import mage.game.events.ZoneChangeEvent; import mage.players.Player; import mage.util.CardUtil; -import java.util.Locale; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/common/ActivateOnlyByOpponentActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/ActivateOnlyByOpponentActivatedAbility.java index 62c78b67913..86675d92471 100644 --- a/Mage/src/main/java/mage/abilities/common/ActivateOnlyByOpponentActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ActivateOnlyByOpponentActivatedAbility.java @@ -4,8 +4,8 @@ package mage.abilities.common; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.effects.Effect; -import mage.constants.Zone; import mage.constants.TargetController; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java index 89c0741a67b..eddff46c57c 100644 --- a/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.SetTargetPointer; diff --git a/Mage/src/main/java/mage/abilities/common/AttacksAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAllTriggeredAbility.java index c290a39cc2e..78e7e049555 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksAllTriggeredAbility.java @@ -1,6 +1,7 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.SetTargetPointer; diff --git a/Mage/src/main/java/mage/abilities/common/AttacksAloneTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAloneTriggeredAbility.java index f88cf4762ea..be82cb919c2 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksAloneTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksAloneTriggeredAbility.java @@ -3,12 +3,13 @@ package mage.abilities.common; import java.util.Objects; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; 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.target.targetpointer.FixedTarget; /** diff --git a/Mage/src/main/java/mage/abilities/common/AttacksAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAttachedTriggeredAbility.java index 4d8c1289fb1..5024b7d020d 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksAttachedTriggeredAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common; import java.util.Locale; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.AttachmentType; diff --git a/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java index c9b3bb32910..cb5d93b6e96 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.SetTargetPointer; diff --git a/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java index 6bae81f1d48..b9800c2e0bf 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java @@ -6,6 +6,7 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/common/BecomesTappedAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTappedAttachedTriggeredAbility.java index 156e8181dc7..0836744172f 100644 --- a/Mage/src/main/java/mage/abilities/common/BecomesTappedAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BecomesTappedAttachedTriggeredAbility.java @@ -1,9 +1,9 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java index c5c72c14837..70e5b64dbc6 100644 --- a/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java @@ -1,9 +1,9 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/common/BecomesTargetAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTargetAttachedTriggeredAbility.java index c7430f27921..8de4bb14f6d 100644 --- a/Mage/src/main/java/mage/abilities/common/BecomesTargetAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BecomesTargetAttachedTriggeredAbility.java @@ -5,8 +5,8 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; 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.Permanent; /** diff --git a/Mage/src/main/java/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java index 64b008afc34..e313dc77d10 100644 --- a/Mage/src/main/java/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java @@ -4,9 +4,9 @@ package mage.abilities.common; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; -import mage.game.events.GameEvent; import mage.constants.Zone; import mage.game.Game; +import mage.game.events.GameEvent; import mage.game.stack.Spell; /** diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java index 3ece2bd9540..8ea6a953b85 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java @@ -1,6 +1,7 @@ package mage.abilities.common; import java.util.Locale; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfPostCombatMainTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfPostCombatMainTriggeredAbility.java index 39b13ac515d..2ea34a39078 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfPostCombatMainTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfPostCombatMainTriggeredAbility.java @@ -8,11 +8,7 @@ package mage.abilities.common; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.TargetController; -import static mage.constants.TargetController.ANY; -import static mage.constants.TargetController.OPPONENT; -import static mage.constants.TargetController.YOU; import mage.constants.Zone; -import static mage.constants.Zone.GRAVEYARD; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java index 7969e308b5c..bba831fd40c 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java @@ -1,6 +1,8 @@ package mage.abilities.common; +import java.util.Locale; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.TargetController; @@ -10,8 +12,6 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; -import java.util.Locale; - /** * @author Loki */ diff --git a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java index 76bee0ed4e0..ea81d700943 100644 --- a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java @@ -1,6 +1,8 @@ package mage.abilities.common; +import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.Zone; @@ -10,9 +12,6 @@ import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.target.targetpointer.FixedTarget; - -import java.util.UUID; /** * diff --git a/Mage/src/main/java/mage/abilities/common/BlocksTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksTriggeredAbility.java index 353271ab187..7bf04adcc2c 100644 --- a/Mage/src/main/java/mage/abilities/common/BlocksTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BlocksTriggeredAbility.java @@ -1,9 +1,9 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; diff --git a/Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java b/Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java index 7cdaaab6960..f4650691a8d 100644 --- a/Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java +++ b/Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.abilities.effects.common.InfoEffect; diff --git a/Mage/src/main/java/mage/abilities/common/CantBlockAbility.java b/Mage/src/main/java/mage/abilities/common/CantBlockAbility.java index 97bbbf68cc9..77aa21a720c 100644 --- a/Mage/src/main/java/mage/abilities/common/CantBlockAbility.java +++ b/Mage/src/main/java/mage/abilities/common/CantBlockAbility.java @@ -1,9 +1,9 @@ package mage.abilities.common; +import mage.abilities.effects.common.combat.CantBlockSourceEffect; import mage.constants.Duration; import mage.constants.Zone; -import mage.abilities.effects.common.combat.CantBlockSourceEffect; /** * diff --git a/Mage/src/main/java/mage/abilities/common/ControllerAssignCombatDamageToBlockersAbility.java b/Mage/src/main/java/mage/abilities/common/ControllerAssignCombatDamageToBlockersAbility.java index 4ade93c758c..8cd671098b8 100644 --- a/Mage/src/main/java/mage/abilities/common/ControllerAssignCombatDamageToBlockersAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ControllerAssignCombatDamageToBlockersAbility.java @@ -1,11 +1,10 @@ package mage.abilities.common; -import mage.abilities.MageSingleton; -import mage.abilities.StaticAbility; - import java.io.ObjectStreamException; +import mage.abilities.MageSingleton; +import mage.abilities.StaticAbility; import mage.constants.AbilityType; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/common/ControllerDivideCombatDamageAbility.java b/Mage/src/main/java/mage/abilities/common/ControllerDivideCombatDamageAbility.java index 43814052e25..1be1e40da33 100644 --- a/Mage/src/main/java/mage/abilities/common/ControllerDivideCombatDamageAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ControllerDivideCombatDamageAbility.java @@ -1,11 +1,10 @@ package mage.abilities.common; -import mage.abilities.MageSingleton; -import mage.abilities.StaticAbility; - import java.io.ObjectStreamException; +import mage.abilities.MageSingleton; +import mage.abilities.StaticAbility; import mage.constants.AbilityType; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/common/ControlsPermanentsControllerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/ControlsPermanentsControllerTriggeredAbility.java index 1e969f3f1fd..67329f2995f 100644 --- a/Mage/src/main/java/mage/abilities/common/ControlsPermanentsControllerTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ControlsPermanentsControllerTriggeredAbility.java @@ -1,9 +1,9 @@ package mage.abilities.common; -import mage.constants.ComparisonType; import mage.abilities.StateTriggeredAbility; import mage.abilities.effects.Effect; +import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/common/CycleOrDiscardControllerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/CycleOrDiscardControllerTriggeredAbility.java index 3725594499e..a55cb131c9a 100644 --- a/Mage/src/main/java/mage/abilities/common/CycleOrDiscardControllerTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/CycleOrDiscardControllerTriggeredAbility.java @@ -1,9 +1,9 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java b/Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java index 07c4fd604e8..4e16e401066 100644 --- a/Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java @@ -1,11 +1,10 @@ package mage.abilities.common; -import mage.abilities.MageSingleton; -import mage.abilities.StaticAbility; - import java.io.ObjectStreamException; +import mage.abilities.MageSingleton; +import mage.abilities.StaticAbility; import mage.constants.AbilityType; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java index b52fe3d4b7d..43dd385f5f4 100644 --- a/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java @@ -2,9 +2,9 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedCreatureEvent; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java index faa6551756f..1a526aca6b0 100644 --- a/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java @@ -1,9 +1,9 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.DamagedCreatureEvent; diff --git a/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java index fe1d1969a0d..7ff2a7dcd1b 100644 --- a/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java @@ -2,13 +2,14 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.SetTargetPointer; 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.Permanent; import mage.target.targetpointer.FixedTarget; diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java index 3a7125f87af..5ede42a168d 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.SetTargetPointer; diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksAllTriggeredAbility.java index 0d281622b9b..311084f6798 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksAllTriggeredAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.SetTargetPointer; diff --git a/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java b/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java index 3a22fd189c2..3b0407a3021 100644 --- a/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java @@ -1,5 +1,9 @@ package mage.abilities.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.SpellAbility; @@ -13,10 +17,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.CardUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java index 1e477edf74d..04eb10a5467 100644 --- a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java @@ -2,6 +2,11 @@ package mage.abilities.common; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import mage.MageObject; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.PayLifeCost; @@ -17,11 +22,6 @@ import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; import mage.target.common.TargetCardInLibrary; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/common/FirstSpellOpponentsTurnTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/FirstSpellOpponentsTurnTriggeredAbility.java index 84aef8d67f7..10065d763a5 100644 --- a/Mage/src/main/java/mage/abilities/common/FirstSpellOpponentsTurnTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/FirstSpellOpponentsTurnTriggeredAbility.java @@ -1,5 +1,7 @@ package mage.abilities.common; +import java.util.List; + import mage.abilities.effects.Effect; import mage.filter.FilterSpell; import mage.game.Game; @@ -7,8 +9,6 @@ import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.watchers.common.SpellsCastWatcher; -import java.util.List; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java index 7ce2028a917..9f621f4650d 100644 --- a/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.SetTargetPointer; diff --git a/Mage/src/main/java/mage/abilities/common/LicidAbility.java b/Mage/src/main/java/mage/abilities/common/LicidAbility.java index 09debf4d124..ddd7293cf1b 100644 --- a/Mage/src/main/java/mage/abilities/common/LicidAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LicidAbility.java @@ -3,6 +3,7 @@ package mage.abilities.common; import java.util.ArrayList; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.SpecialAction; diff --git a/Mage/src/main/java/mage/abilities/common/PassAbility.java b/Mage/src/main/java/mage/abilities/common/PassAbility.java index 08ebb1608a6..9d7a33c74dd 100644 --- a/Mage/src/main/java/mage/abilities/common/PassAbility.java +++ b/Mage/src/main/java/mage/abilities/common/PassAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common; import java.util.UUID; + import mage.abilities.ActivatedAbilityImpl; import mage.abilities.effects.common.PassEffect; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/common/SacrificeIfCastAtInstantTimeTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SacrificeIfCastAtInstantTimeTriggeredAbility.java index 9fac7a0a948..c537ecebbf5 100644 --- a/Mage/src/main/java/mage/abilities/common/SacrificeIfCastAtInstantTimeTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SacrificeIfCastAtInstantTimeTriggeredAbility.java @@ -8,8 +8,8 @@ import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.SacrificeSourceEffect; 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.stack.Spell; /** diff --git a/Mage/src/main/java/mage/abilities/common/SanctuaryInterveningIfTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SanctuaryInterveningIfTriggeredAbility.java index 9e07b935227..437c9308587 100644 --- a/Mage/src/main/java/mage/abilities/common/SanctuaryInterveningIfTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SanctuaryInterveningIfTriggeredAbility.java @@ -7,8 +7,8 @@ import mage.abilities.condition.CompoundCondition; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; +import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; import mage.constants.TargetController; import mage.filter.FilterPermanent; diff --git a/Mage/src/main/java/mage/abilities/common/SignatureSpellCastOnlyWithOathbreakerEffect.java b/Mage/src/main/java/mage/abilities/common/SignatureSpellCastOnlyWithOathbreakerEffect.java index ad64d77eb88..cfef1b4d8a9 100644 --- a/Mage/src/main/java/mage/abilities/common/SignatureSpellCastOnlyWithOathbreakerEffect.java +++ b/Mage/src/main/java/mage/abilities/common/SignatureSpellCastOnlyWithOathbreakerEffect.java @@ -1,5 +1,7 @@ package mage.abilities.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -8,8 +10,6 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; -import java.util.UUID; - /** * For oathbreaker game mode * diff --git a/Mage/src/main/java/mage/abilities/common/SimpleActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/SimpleActivatedAbility.java index 069e381bfb5..ff1e17a03b9 100644 --- a/Mage/src/main/java/mage/abilities/common/SimpleActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SimpleActivatedAbility.java @@ -1,12 +1,12 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.effects.Effect; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/common/SimpleTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SimpleTriggeredAbility.java index 2ca4e134b54..06f8248b883 100644 --- a/Mage/src/main/java/mage/abilities/common/SimpleTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SimpleTriggeredAbility.java @@ -2,9 +2,9 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/abilities/common/UnattachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/UnattachedTriggeredAbility.java index 83fe71cfbc6..de8e09a9e88 100644 --- a/Mage/src/main/java/mage/abilities/common/UnattachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/UnattachedTriggeredAbility.java @@ -2,9 +2,9 @@ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; diff --git a/Mage/src/main/java/mage/abilities/common/WhileSearchingPlayFromLibraryAbility.java b/Mage/src/main/java/mage/abilities/common/WhileSearchingPlayFromLibraryAbility.java index 193f731548c..541969ad328 100644 --- a/Mage/src/main/java/mage/abilities/common/WhileSearchingPlayFromLibraryAbility.java +++ b/Mage/src/main/java/mage/abilities/common/WhileSearchingPlayFromLibraryAbility.java @@ -1,11 +1,10 @@ package mage.abilities.common; -import mage.abilities.MageSingleton; -import mage.abilities.StaticAbility; - import java.io.ObjectStreamException; +import mage.abilities.MageSingleton; +import mage.abilities.StaticAbility; import mage.constants.AbilityType; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java index 8ec64e77600..228c2c59935 100644 --- a/Mage/src/main/java/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java +++ b/Mage/src/main/java/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java @@ -2,6 +2,7 @@ package mage.abilities.common.delayed; import java.util.LinkedHashSet; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java index 1bb565531ab..e8c9d49251b 100644 --- a/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java @@ -1,11 +1,11 @@ package mage.abilities.common.delayed; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/condition/CompoundCondition.java b/Mage/src/main/java/mage/abilities/condition/CompoundCondition.java index 9a6e077d36c..3bf52f45f15 100644 --- a/Mage/src/main/java/mage/abilities/condition/CompoundCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/CompoundCondition.java @@ -1,12 +1,12 @@ package mage.abilities.condition; -import mage.abilities.Ability; -import mage.game.Game; - import java.util.ArrayList; import java.util.Arrays; +import mage.abilities.Ability; +import mage.game.Game; + /** * Combines conditions to one compound conditon, all single conditons must be * true to return true for the compound condtion. diff --git a/Mage/src/main/java/mage/abilities/condition/Condition.java b/Mage/src/main/java/mage/abilities/condition/Condition.java index 512d3720003..c6f26b879cd 100644 --- a/Mage/src/main/java/mage/abilities/condition/Condition.java +++ b/Mage/src/main/java/mage/abilities/condition/Condition.java @@ -1,10 +1,10 @@ package mage.abilities.condition; +import java.io.Serializable; + import mage.abilities.Ability; import mage.game.Game; -import java.io.Serializable; - /** * Interface describing condition occurrence. diff --git a/Mage/src/main/java/mage/abilities/condition/OrCondition.java b/Mage/src/main/java/mage/abilities/condition/OrCondition.java index 0d5bb3f6ca9..e1469acd4c6 100644 --- a/Mage/src/main/java/mage/abilities/condition/OrCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/OrCondition.java @@ -3,6 +3,7 @@ package mage.abilities.condition; import java.util.ArrayList; import java.util.Arrays; + import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/AdamantCondition.java b/Mage/src/main/java/mage/abilities/condition/common/AdamantCondition.java index 4e45cdf04f2..8246a0c8301 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/AdamantCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/AdamantCondition.java @@ -1,5 +1,7 @@ package mage.abilities.condition.common; +import java.util.Arrays; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.condition.Condition; @@ -8,8 +10,6 @@ import mage.constants.ColoredManaSymbol; import mage.game.Game; import mage.watchers.common.ManaSpentToCastWatcher; -import java.util.Arrays; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/condition/common/AddendumCondition.java b/Mage/src/main/java/mage/abilities/condition/common/AddendumCondition.java index 4bc9f34d73a..f59bff652ce 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/AddendumCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/AddendumCondition.java @@ -1,15 +1,15 @@ package mage.abilities.condition.common; +import java.util.EnumSet; +import java.util.Set; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.TurnPhase; import mage.game.Game; import mage.game.stack.Spell; -import java.util.EnumSet; -import java.util.Set; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java index 85dbe804db9..87f76c81199 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java @@ -1,14 +1,14 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.condition.Condition; +import mage.constants.ComparisonType; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java index 2b7edf0f573..25774225967 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java @@ -4,8 +4,8 @@ package mage.abilities.condition.common; import java.util.UUID; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.condition.Condition; +import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java index 5a683073b82..17e4e265b07 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java @@ -1,12 +1,12 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * Condition for - * Any opponent has X or more cards in their graveyard diff --git a/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java index 28e8f13ca8f..47d7c43131c 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java @@ -1,5 +1,7 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.CommanderCardType; @@ -7,8 +9,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.UUID; - /** * Checks if the player has its commander in play and controls it * diff --git a/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java index 8558104f948..e1917a23789 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java index 2e5d8665a48..a7e34c87b5e 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java index 87b79fe88bc..6e4b4787ba0 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java @@ -9,6 +9,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.FilterPermanent; diff --git a/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentsComparedToOpponentsCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentsComparedToOpponentsCondition.java index 2124fb47d71..0ac295a32c9 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentsComparedToOpponentsCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentsComparedToOpponentsCondition.java @@ -2,6 +2,7 @@ package mage.abilities.condition.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.ComparisonType; diff --git a/Mage/src/main/java/mage/abilities/condition/common/CreatureCountCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CreatureCountCondition.java index 6b2686030dd..a1f31d7a3cd 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CreatureCountCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CreatureCountCondition.java @@ -6,6 +6,7 @@ package mage.abilities.condition.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.TargetController; diff --git a/Mage/src/main/java/mage/abilities/condition/common/DealtDamageToAnOpponent.java b/Mage/src/main/java/mage/abilities/condition/common/DealtDamageToAnOpponent.java index 57e48306403..68914063641 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/DealtDamageToAnOpponent.java +++ b/Mage/src/main/java/mage/abilities/condition/common/DealtDamageToAnOpponent.java @@ -2,6 +2,7 @@ package mage.abilities.condition.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/DefendingPlayerControlsCondition.java b/Mage/src/main/java/mage/abilities/condition/common/DefendingPlayerControlsCondition.java index 6b709442597..018e90747e7 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/DefendingPlayerControlsCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/DefendingPlayerControlsCondition.java @@ -2,6 +2,7 @@ package mage.abilities.condition.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.FilterPermanent; diff --git a/Mage/src/main/java/mage/abilities/condition/common/DevouredCreaturesCondition.java b/Mage/src/main/java/mage/abilities/condition/common/DevouredCreaturesCondition.java index 9ce29ee62d9..a5e9f2e24af 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/DevouredCreaturesCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/DevouredCreaturesCondition.java @@ -2,11 +2,11 @@ package mage.abilities.condition.common; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.condition.IntCompareCondition; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DevourEffect; import mage.abilities.keyword.DevourAbility; +import mage.constants.ComparisonType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/condition/common/EnchantedSourceCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EnchantedSourceCondition.java index c483023f88a..70d531e82d0 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/EnchantedSourceCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/EnchantedSourceCondition.java @@ -2,6 +2,7 @@ package mage.abilities.condition.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; 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 d1d5ae98cee..9e1dd2029d9 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java @@ -1,6 +1,8 @@ package mage.abilities.condition.common; +import java.util.EnumSet; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.SuperType; @@ -8,8 +10,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.EnumSet; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/abilities/condition/common/EquippedMultipleSourceCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquippedMultipleSourceCondition.java index 259b3cff3ac..ef97a64786c 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/EquippedMultipleSourceCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/EquippedMultipleSourceCondition.java @@ -1,14 +1,14 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * Describes condition when creature is equipped with more than one Equipment. * diff --git a/Mage/src/main/java/mage/abilities/condition/common/EquippedSourceCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquippedSourceCondition.java index cdcd889f8fd..0bc9fe2714b 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/EquippedSourceCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/EquippedSourceCondition.java @@ -1,14 +1,14 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; -import mage.constants.SubType; - /** * Describes condition when creature is equipped. * diff --git a/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java b/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java index becf859c429..44457ab1c63 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java @@ -3,8 +3,8 @@ package mage.abilities.condition.common; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.condition.Condition; +import mage.constants.ComparisonType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/MainPhaseStackEmptyCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MainPhaseStackEmptyCondition.java index 45dbbb1ba29..57588acce0e 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/MainPhaseStackEmptyCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/MainPhaseStackEmptyCondition.java @@ -4,9 +4,9 @@ package mage.abilities.condition.common; import java.util.EnumSet; import java.util.Set; -import mage.constants.TurnPhase; import mage.abilities.Ability; import mage.abilities.condition.Condition; +import mage.constants.TurnPhase; import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java index f6b939cc6ea..45151ae60f6 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java @@ -4,7 +4,6 @@ package mage.abilities.condition.common; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; -import mage.watchers.Watcher; import mage.watchers.common.MorbidWatcher; /** diff --git a/Mage/src/main/java/mage/abilities/condition/common/MoreCardsInHandThanOpponentsCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MoreCardsInHandThanOpponentsCondition.java index d2d873d5236..ce3ca10452e 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/MoreCardsInHandThanOpponentsCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/MoreCardsInHandThanOpponentsCondition.java @@ -1,12 +1,12 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - public enum MoreCardsInHandThanOpponentsCondition implements Condition { instance; diff --git a/Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java b/Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java index 42b2b2d854c..02d5463a9f9 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java @@ -2,6 +2,7 @@ package mage.abilities.condition.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/OathbreakerOnBattlefieldCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OathbreakerOnBattlefieldCondition.java index ad26f8a79d1..20c8e8e1033 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OathbreakerOnBattlefieldCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OathbreakerOnBattlefieldCondition.java @@ -1,5 +1,10 @@ package mage.abilities.condition.common; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.cards.Card; @@ -10,11 +15,6 @@ import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.util.ManaUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.UUID; - /** * For Oathbreaker game mode * diff --git a/Mage/src/main/java/mage/abilities/condition/common/OneOpponentCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OneOpponentCondition.java index 36b83548858..b9b53299259 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OneOpponentCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OneOpponentCondition.java @@ -1,13 +1,13 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * * @author TheElk801 diff --git a/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsMoreCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsMoreCondition.java index 93139b21dad..41ad8ded6e6 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsMoreCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsMoreCondition.java @@ -3,6 +3,7 @@ package mage.abilities.condition.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.FilterPermanent; diff --git a/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java index 25b98e853ca..eb2ebe33261 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java @@ -5,8 +5,8 @@ package mage.abilities.condition.common; import java.util.UUID; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.condition.Condition; +import mage.constants.ComparisonType; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/OpponentHasMoreLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OpponentHasMoreLifeCondition.java index 5ea4d9a6131..9d76df0e583 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OpponentHasMoreLifeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OpponentHasMoreLifeCondition.java @@ -2,13 +2,13 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * * @author fireshoes diff --git a/Mage/src/main/java/mage/abilities/condition/common/OpponentLostLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OpponentLostLifeCondition.java index c509ebabc1c..7a561d76695 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OpponentLostLifeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OpponentLostLifeCondition.java @@ -1,14 +1,14 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.condition.IntCompareCondition; +import mage.constants.ComparisonType; import mage.game.Game; import mage.watchers.common.PlayerLostLifeWatcher; -import java.util.UUID; - /** * Describes condition when an opponent has lost an amount of life * diff --git a/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java index 0e434224cf7..944a6c1d131 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java @@ -1,16 +1,16 @@ package mage.abilities.condition.common; -import mage.abilities.Ability; -import mage.constants.ComparisonType; -import mage.abilities.condition.Condition; -import mage.counters.CounterType; -import mage.game.Game; -import mage.filter.FilterPermanent; -import mage.game.permanent.Permanent; - import java.util.List; +import mage.abilities.Ability; +import mage.abilities.condition.Condition; +import mage.constants.ComparisonType; +import mage.counters.CounterType; +import mage.filter.FilterPermanent; +import mage.game.Game; +import mage.game.permanent.Permanent; + /** * @author jeffwadsworth */ diff --git a/Mage/src/main/java/mage/abilities/condition/common/SourceHasRemainedInSameZoneCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceHasRemainedInSameZoneCondition.java index 1636d319885..337d913bdc7 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceHasRemainedInSameZoneCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceHasRemainedInSameZoneCondition.java @@ -2,6 +2,7 @@ package mage.abilities.condition.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java index b4d46d2ade0..d80b59a75d0 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java @@ -3,6 +3,7 @@ package mage.abilities.condition.common; import java.util.Objects; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldOrCommandZoneCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldOrCommandZoneCondition.java index 8229c464364..7c43f6c639c 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldOrCommandZoneCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldOrCommandZoneCondition.java @@ -3,6 +3,7 @@ package mage.abilities.condition.common; import java.util.Iterator; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/SourceTappedBeforeUntapStepCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceTappedBeforeUntapStepCondition.java index 098b5a7e20a..83880e735a7 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceTappedBeforeUntapStepCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceTappedBeforeUntapStepCondition.java @@ -2,6 +2,8 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.PhaseStep; @@ -10,8 +12,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.turn.Step; -import java.util.UUID; - /** * * @author spjspj diff --git a/Mage/src/main/java/mage/abilities/condition/common/SourceTargetsPermanentCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceTargetsPermanentCondition.java index b4e3697752e..49d73ec70b7 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceTargetsPermanentCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceTargetsPermanentCondition.java @@ -1,5 +1,7 @@ package mage.abilities.condition.common; +import java.util.Iterator; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.FilterPermanent; @@ -8,8 +10,6 @@ import mage.game.permanent.Permanent; import mage.game.stack.StackObject; import mage.target.Target; -import java.util.Iterator; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/condition/common/SpectacleCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SpectacleCondition.java index 80824119441..d57b7e3d7e4 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SpectacleCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SpectacleCondition.java @@ -1,15 +1,15 @@ package mage.abilities.condition.common; +import java.util.ArrayList; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.keyword.SpectacleAbility; import mage.constants.AbilityType; import mage.game.Game; -import java.util.ArrayList; -import java.util.List; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/condition/common/SurgedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SurgedCondition.java index f15a8906ca5..f14d81f41a0 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SurgedCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SurgedCondition.java @@ -1,15 +1,15 @@ package mage.abilities.condition.common; +import java.util.ArrayList; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.keyword.SurgeAbility; import mage.constants.AbilityType; import mage.game.Game; -import java.util.ArrayList; -import java.util.List; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java index dcdd6a81627..bffcc98f356 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java @@ -2,11 +2,11 @@ package mage.abilities.condition.common; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.keyword.SuspendAbility; import mage.cards.Card; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/condition/common/XorLessLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/XorLessLifeCondition.java index 2a0837cf6f9..1e1cb79184e 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/XorLessLifeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/XorLessLifeCondition.java @@ -1,14 +1,14 @@ package mage.abilities.condition.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; import mage.players.Player; import mage.players.PlayerList; -import java.util.UUID; - /** * * @author maurer.it_at_gmail.com diff --git a/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java index d8ab4297193..fce1f557829 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java @@ -1,8 +1,8 @@ package mage.abilities.condition.common; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.condition.IntCompareCondition; +import mage.constants.ComparisonType; import mage.game.Game; import mage.watchers.common.PlayerGainedLifeWatcher; diff --git a/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java index 25ba6f8f4fd..60ff46c0119 100644 --- a/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java +++ b/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java @@ -1,6 +1,8 @@ package mage.abilities.costs; +import java.util.Iterator; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; @@ -15,8 +17,6 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import java.util.Iterator; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/costs/CompositeCost.java b/Mage/src/main/java/mage/abilities/costs/CompositeCost.java index d4d38a1a665..b31a5118521 100644 --- a/Mage/src/main/java/mage/abilities/costs/CompositeCost.java +++ b/Mage/src/main/java/mage/abilities/costs/CompositeCost.java @@ -1,6 +1,7 @@ package mage.abilities.costs; import java.util.UUID; + import mage.abilities.Ability; import mage.game.Game; import mage.target.Targets; diff --git a/Mage/src/main/java/mage/abilities/costs/Cost.java b/Mage/src/main/java/mage/abilities/costs/Cost.java index af3ffa182a3..2474eee8615 100644 --- a/Mage/src/main/java/mage/abilities/costs/Cost.java +++ b/Mage/src/main/java/mage/abilities/costs/Cost.java @@ -1,12 +1,12 @@ package mage.abilities.costs; +import java.io.Serializable; +import java.util.UUID; + import mage.abilities.Ability; import mage.game.Game; import mage.target.Targets; -import java.io.Serializable; -import java.util.UUID; - public interface Cost extends Serializable { UUID getId(); diff --git a/Mage/src/main/java/mage/abilities/costs/CostImpl.java b/Mage/src/main/java/mage/abilities/costs/CostImpl.java index 17121047083..8fbefc83be1 100644 --- a/Mage/src/main/java/mage/abilities/costs/CostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/CostImpl.java @@ -2,6 +2,7 @@ package mage.abilities.costs; import java.util.UUID; + import mage.abilities.Ability; import mage.game.Game; import mage.target.Target; diff --git a/Mage/src/main/java/mage/abilities/costs/CostsImpl.java b/Mage/src/main/java/mage/abilities/costs/CostsImpl.java index f4f1c1acaea..eb82cd42956 100644 --- a/Mage/src/main/java/mage/abilities/costs/CostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/CostsImpl.java @@ -4,6 +4,7 @@ package mage.abilities.costs; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.VariableManaCost; diff --git a/Mage/src/main/java/mage/abilities/costs/OrCost.java b/Mage/src/main/java/mage/abilities/costs/OrCost.java index df79fe81271..f40ac88e64f 100644 --- a/Mage/src/main/java/mage/abilities/costs/OrCost.java +++ b/Mage/src/main/java/mage/abilities/costs/OrCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/costs/VariableCostImpl.java b/Mage/src/main/java/mage/abilities/costs/VariableCostImpl.java index 6d38676d0de..169581800b6 100644 --- a/Mage/src/main/java/mage/abilities/costs/VariableCostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/VariableCostImpl.java @@ -1,5 +1,7 @@ package mage.abilities.costs; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.mana.ManaAbility; import mage.game.Game; @@ -8,8 +10,6 @@ import mage.players.Player; import mage.target.Target; import mage.target.Targets; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/costs/common/ControlPermanentCost.java b/Mage/src/main/java/mage/abilities/costs/common/ControlPermanentCost.java index 64d6974a666..f89a7c759f2 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ControlPermanentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ControlPermanentCost.java @@ -1,13 +1,13 @@ package mage.abilities.costs.common; +import java.util.UUID; + import mage.abilities.Ability; +import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; -import java.util.UUID; -import mage.abilities.costs.Cost; - public class ControlPermanentCost extends CostImpl { private FilterControlledPermanent filter; diff --git a/Mage/src/main/java/mage/abilities/costs/common/CyclingDiscardCost.java b/Mage/src/main/java/mage/abilities/costs/common/CyclingDiscardCost.java index 522b5943fb7..4382f0cdc9b 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/CyclingDiscardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/CyclingDiscardCost.java @@ -8,6 +8,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/DiscardHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/DiscardHandCost.java index 4023d942b47..62f35e2bbbd 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/DiscardHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/DiscardHandCost.java @@ -3,6 +3,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/DiscardSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/DiscardSourceCost.java index 225f97a10ff..8736ffc0023 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/DiscardSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/DiscardSourceCost.java @@ -2,6 +2,8 @@ package mage.abilities.costs.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -9,8 +11,6 @@ import mage.cards.Card; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java index ff190e15cbe..fedb3be4ebc 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java @@ -4,6 +4,7 @@ package mage.abilities.costs.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/DynamicValueGenericManaCost.java b/Mage/src/main/java/mage/abilities/costs/common/DynamicValueGenericManaCost.java index d98d8f81bff..1c3408d219f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/DynamicValueGenericManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/DynamicValueGenericManaCost.java @@ -1,5 +1,7 @@ package mage.abilities.costs.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -7,8 +9,6 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.game.Game; import mage.util.ManaUtil; -import java.util.UUID; - public class DynamicValueGenericManaCost extends CostImpl { DynamicValue amount; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExertSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExertSourceCost.java index 957921b67f9..6fdae7f2272 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExertSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExertSourceCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java index dd70b3866b6..e0fef6bcc49 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java @@ -4,6 +4,7 @@ package mage.abilities.costs.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java index 5074791ef48..c51d614a4de 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java @@ -1,5 +1,9 @@ package mage.abilities.costs.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -13,10 +17,6 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java index b9ae752cf5f..2f83a2c2679 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java index c427b5bf8c8..490e28267a1 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java index 38045a9cf8d..0d9e255faa1 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java @@ -6,6 +6,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java index 5e460a9b445..cc932891a16 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java index 0cf07fb3bdd..240ffb7c32a 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java index b4039fdf834..2037e759efb 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java @@ -5,6 +5,7 @@ package mage.abilities.costs.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java index dfb871086e3..8644f6e92c2 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java @@ -6,6 +6,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java index 7d2087ab503..c13597db2c6 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java @@ -6,6 +6,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java b/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java index b91407c6463..642bcd060c0 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java @@ -7,6 +7,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/GainLifePlayersCost.java b/Mage/src/main/java/mage/abilities/costs/common/GainLifePlayersCost.java index 4a9219cff3f..d68bb5e85ba 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/GainLifePlayersCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/GainLifePlayersCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java index 9f02bc30528..915aa5cd1e6 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java index 18c902d5af4..f2c09f12d29 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java @@ -1,5 +1,7 @@ package mage.abilities.costs.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -8,8 +10,6 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.game.Game; import mage.game.events.GameEvent; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/costs/common/PayLoyaltyCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayLoyaltyCost.java index 55ea9f43f85..3c4e46fd2b6 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayLoyaltyCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayLoyaltyCost.java @@ -1,6 +1,8 @@ package mage.abilities.costs.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -8,8 +10,6 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/costs/common/PayVariableLoyaltyCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayVariableLoyaltyCost.java index 4a68096e26b..0d4f0fe4a1b 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayVariableLoyaltyCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayVariableLoyaltyCost.java @@ -3,6 +3,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.VariableCostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/PutCardFromHandOnTopOfLibraryCost.java b/Mage/src/main/java/mage/abilities/costs/common/PutCardFromHandOnTopOfLibraryCost.java index bd235979693..e90c5d69fef 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutCardFromHandOnTopOfLibraryCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutCardFromHandOnTopOfLibraryCost.java @@ -5,6 +5,8 @@ */ package mage.abilities.costs.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -15,8 +17,6 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; -import java.util.UUID; - /** * @author jeffwadsworth */ diff --git a/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java index 2d0abb26c33..f95c32c8b8d 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/PutSourceOnBottomOwnerLibraryCost.java b/Mage/src/main/java/mage/abilities/costs/common/PutSourceOnBottomOwnerLibraryCost.java index a49b52480cc..478cd84e757 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutSourceOnBottomOwnerLibraryCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutSourceOnBottomOwnerLibraryCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java index 232961e4496..1d78cd749c7 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java @@ -4,6 +4,7 @@ package mage.abilities.costs.common; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java index ab1196345f3..bb996d98e28 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java @@ -1,5 +1,9 @@ package mage.abilities.costs.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -14,10 +18,6 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.util.CardUtil; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * @author LevelX */ diff --git a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java index b3179e3e8f0..e44cae16779 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java @@ -3,6 +3,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java index bb7cc921387..8dc57fa96ed 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java @@ -3,6 +3,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.VariableCostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java index b88a5e445e2..c5efad1f6ca 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java @@ -4,6 +4,7 @@ package mage.abilities.costs.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromBattlefieldSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromBattlefieldSourceCost.java index 1ca025b51eb..c8d75918599 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromBattlefieldSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromBattlefieldSourceCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java index 8771dcae91d..4a9a8d0f9cf 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java @@ -4,6 +4,7 @@ package mage.abilities.costs.common; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/RevealHandSourceControllerCost.java b/Mage/src/main/java/mage/abilities/costs/common/RevealHandSourceControllerCost.java index c91c60c9b77..edc89eb8e98 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealHandSourceControllerCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealHandSourceControllerCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/costs/common/RevealSecretOpponentCost.java b/Mage/src/main/java/mage/abilities/costs/common/RevealSecretOpponentCost.java index daf8d54be58..077914403a5 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealSecretOpponentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealSecretOpponentCost.java @@ -1,5 +1,7 @@ package mage.abilities.costs.common; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -9,8 +11,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.UUID; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java index 76659ce7e0b..06c1789c091 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java index 4bd68606344..861896ce0a2 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java @@ -5,6 +5,7 @@ package mage.abilities.costs.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/costs/common/SacrificeAllCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeAllCost.java index 9e9c62345e9..70580e489f3 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeAllCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeAllCost.java @@ -4,6 +4,7 @@ package mage.abilities.costs.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/costs/common/SacrificeAttachedCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeAttachedCost.java index 616e65026b2..202f0992813 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeAttachedCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeAttachedCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java index d2e101e25e0..f3b1e32e014 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java index 51644679b55..691b83b10b4 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java @@ -1,6 +1,10 @@ package mage.abilities.costs.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; @@ -12,10 +16,6 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledPermanent; import mage.util.CardUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/costs/common/TapAttachedCost.java b/Mage/src/main/java/mage/abilities/costs/common/TapAttachedCost.java index 7dcfa103116..b84ab887c90 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/TapAttachedCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/TapAttachedCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/TapSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/TapSourceCost.java index 3526217924f..b5d74c01202 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/TapSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/TapSourceCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java index 0496b899442..5bb5235d2f4 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java @@ -1,5 +1,7 @@ package mage.abilities.costs.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -9,8 +11,6 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledPermanent; import mage.util.CardUtil; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/costs/common/UnattachCost.java b/Mage/src/main/java/mage/abilities/costs/common/UnattachCost.java index 9cdc11a23a6..9a4325e1836 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/UnattachCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/UnattachCost.java @@ -1,6 +1,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/UntapSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/UntapSourceCost.java index 3a808c48ac3..3da4e194552 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/UntapSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/UntapSourceCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; diff --git a/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java index 27bf912ba42..149ed3db1d5 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java @@ -1,16 +1,16 @@ package mage.abilities.costs.common; -import mage.constants.Outcome; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; +import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledPermanent; - -import java.util.List; -import java.util.UUID; -import mage.abilities.costs.Cost; import mage.util.CardUtil; /** diff --git a/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java index 0db245fa8db..53096542e3b 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java @@ -3,6 +3,7 @@ package mage.abilities.costs.mana; import java.util.ArrayList; import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java index 67067177823..d2a6da939c9 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java @@ -2,6 +2,7 @@ package mage.abilities.costs.mana; import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java index afbab56ea0b..87588a4cbdf 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java @@ -1,5 +1,9 @@ package mage.abilities.costs.mana; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -14,10 +18,6 @@ import mage.players.ManaPool; import mage.players.Player; import mage.util.ManaUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - public abstract class ManaCostImpl extends CostImpl implements ManaCost { protected Mana payment; diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java index 6aea5f0101f..0b48704acc9 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java @@ -1,14 +1,14 @@ package mage.abilities.costs.mana; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.VariableCost; import mage.game.Game; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; - /** * @param * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java index a66d7a5702a..8f67d04b153 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java @@ -1,5 +1,12 @@ package mage.abilities.costs.mana; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -19,8 +26,6 @@ import mage.players.Player; import mage.target.Targets; import mage.util.ManaUtil; -import java.util.*; - /** * @param * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java index 877d21c55bd..271ede4a184 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java @@ -2,14 +2,13 @@ package mage.abilities.costs.mana; -import mage.ManaSymbol; -import mage.constants.ColoredManaSymbol; - import java.util.ArrayList; import java.util.EnumMap; -import java.util.HashMap; import java.util.Map; +import mage.ManaSymbol; +import mage.constants.ColoredManaSymbol; + /** * Represents the mana symbols on a card. * diff --git a/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java index e7c15468e3c..c7c7440afa0 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java @@ -1,5 +1,8 @@ package mage.abilities.costs.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -7,9 +10,6 @@ import mage.constants.ColoredManaSymbol; import mage.game.Game; import mage.players.ManaPool; -import java.util.ArrayList; -import java.util.List; - public class MonoHybridManaCost extends ManaCostImpl { private final ColoredManaSymbol mana; diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousEffect.java index 9685b3fd69c..7e6b8bfe117 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousEffect.java @@ -1,5 +1,12 @@ package mage.abilities.decorator; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +import org.junit.Assert; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.condition.Condition; @@ -7,14 +14,12 @@ import mage.abilities.condition.FixedCondition; import mage.abilities.condition.LockedInCondition; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.DependencyType; +import mage.constants.Duration; +import mage.constants.EffectType; +import mage.constants.Layer; +import mage.constants.SubLayer; import mage.game.Game; -import org.junit.Assert; - -import java.util.EnumSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; /** * Adds condition to {@link ContinuousEffect}. Acts as decorator. diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalGainActivatedAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalGainActivatedAbility.java index cc8a43a6f43..13f3027a18c 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalGainActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalGainActivatedAbility.java @@ -2,6 +2,7 @@ package mage.abilities.decorator; import java.util.UUID; + import mage.abilities.ActivatedAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java index 7b34d3f941a..e389b7d7bd8 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java @@ -1,5 +1,7 @@ package mage.abilities.decorator; +import java.util.List; + import mage.abilities.Modes; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -11,8 +13,6 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.List; - /** * Adds condition to {@link mage.abilities.effects.ContinuousEffect}. Acts as * decorator. diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java index 9928d870e83..afb1f37f4c3 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java @@ -1,6 +1,7 @@ package mage.abilities.decorator; import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.condition.Condition; diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalRequirementEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalRequirementEffect.java index 148be62172d..beec7bf6891 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalRequirementEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalRequirementEffect.java @@ -1,5 +1,7 @@ package mage.abilities.decorator; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.condition.FixedCondition; @@ -10,8 +12,6 @@ import mage.constants.EffectType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java index f3e347292fb..e12b7deacd2 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java @@ -1,5 +1,7 @@ package mage.abilities.decorator; +import java.util.List; + import mage.abilities.Modes; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -11,8 +13,6 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.List; - /** * Adds condition to {@link mage.abilities.effects.ContinuousEffect}. Acts as * decorator. diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java index bd488c7cf5a..0c3e082f26c 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java @@ -3,6 +3,7 @@ package mage.abilities.dynamicvalue; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; + import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/DynamicValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/DynamicValue.java index 7a3180a90fb..4e66d277b6f 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/DynamicValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/DynamicValue.java @@ -1,11 +1,11 @@ package mage.abilities.dynamicvalue; +import java.io.Serializable; + import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.game.Game; -import java.io.Serializable; - public interface DynamicValue extends Serializable { int calculate(Game game, Ability sourceAbility, Effect effect); DynamicValue copy(); diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingFilterCreatureCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingFilterCreatureCount.java index 5cee8d75445..9bddbb3391a 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingFilterCreatureCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingFilterCreatureCount.java @@ -2,6 +2,7 @@ package mage.abilities.dynamicvalue.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/AuraAttachedCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/AuraAttachedCount.java index 02816bd5f18..1ab3ab1e079 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/AuraAttachedCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/AuraAttachedCount.java @@ -3,6 +3,7 @@ package mage.abilities.dynamicvalue.common; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypesInGraveyardCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypesInGraveyardCount.java index 32b2d553186..383f56231a2 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypesInGraveyardCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypesInGraveyardCount.java @@ -1,5 +1,7 @@ package mage.abilities.dynamicvalue.common; +import java.util.EnumSet; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -8,8 +10,6 @@ import mage.constants.CardType; import mage.game.Game; import mage.players.Player; -import java.util.EnumSet; - /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java index 72cd99216cb..8110874fb7a 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java @@ -1,6 +1,7 @@ package mage.abilities.dynamicvalue.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllHandsCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllHandsCount.java index 5910f57a6c9..c09c0f69b68 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllHandsCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllHandsCount.java @@ -1,14 +1,14 @@ package mage.abilities.dynamicvalue.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * @author emerald000 */ diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java index 1bc24e1aa6d..abc20df41f0 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java @@ -6,6 +6,7 @@ package mage.abilities.dynamicvalue.common; import java.io.ObjectStreamException; + import mage.MageObject; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java index 2663f6a0405..a8498431815 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java @@ -3,6 +3,7 @@ package mage.abilities.dynamicvalue.common; import java.io.ObjectStreamException; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.MageSingleton; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DevotionCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DevotionCount.java index 97cb299f60d..b63d3fb62a8 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DevotionCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DevotionCount.java @@ -1,5 +1,10 @@ package mage.abilities.dynamicvalue.common; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.stream.Collectors; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -12,11 +17,6 @@ import mage.abilities.hint.ValueHint; import mage.constants.ColoredManaSymbol; import mage.game.Game; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.stream.Collectors; - /** * Each colored mana symbol (e.g. {U}) in the mana costs of permanents you * control counts toward your devotion to that color. diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java index cdb7d1360bd..ca6d55c1e4a 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java @@ -1,5 +1,7 @@ package mage.abilities.dynamicvalue.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -7,8 +9,6 @@ import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author Loki */ diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java index f87d0fa045a..b6aa8340a89 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java @@ -1,6 +1,9 @@ package mage.abilities.dynamicvalue.common; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -8,9 +11,6 @@ import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.List; -import java.util.UUID; - /** * * @author North, noxx diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/GetKickerXValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GetKickerXValue.java index fe7203deaff..68b07a9ba63 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/GetKickerXValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GetKickerXValue.java @@ -1,17 +1,13 @@ package mage.abilities.dynamicvalue.common; import mage.abilities.Ability; -import mage.abilities.costs.OptionalAdditionalCost; import mage.abilities.costs.OptionalAdditionalCostImpl; -import mage.abilities.costs.VariableCost; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.keyword.KickerAbility; import mage.game.Game; import mage.game.stack.Spell; -import java.util.List; - /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/GreatestPowerAmongControlledCreaturesValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GreatestPowerAmongControlledCreaturesValue.java index 8989267cc2a..e81c7a73157 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/GreatestPowerAmongControlledCreaturesValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GreatestPowerAmongControlledCreaturesValue.java @@ -7,7 +7,6 @@ import mage.abilities.effects.Effect; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.players.Player; /** * @author Styxo diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java index 5a566ef04ff..6a695e2a3d1 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java @@ -1,13 +1,13 @@ package mage.abilities.dynamicvalue.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.game.Game; import mage.watchers.common.PlayerLostLifeWatcher; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java index 76f16fe6ad9..c1c06844388 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java @@ -1,5 +1,8 @@ package mage.abilities.dynamicvalue.common; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -7,9 +10,6 @@ import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; -import java.util.Set; -import java.util.UUID; - public enum OpponentsPoisonCountersCount implements DynamicValue { instance; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java index e9ee81f4ce3..8f8ac2c1355 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java @@ -3,6 +3,7 @@ package mage.abilities.dynamicvalue.common; import java.io.ObjectStreamException; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.MageSingleton; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java index 981792a69c3..dd0d6af8fbe 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java @@ -2,6 +2,7 @@ package mage.abilities.dynamicvalue.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java index 3a98ec1d655..4b0aef0032e 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java @@ -1,15 +1,15 @@ package mage.abilities.dynamicvalue.common; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.Set; -import java.util.UUID; - public enum PermanentsYouOwnThatOpponentsControlCount implements DynamicValue { instance; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java index 14a21180aa2..50f5cf5c4fa 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java @@ -2,6 +2,8 @@ package mage.abilities.dynamicvalue.common; +import java.io.ObjectStreamException; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -9,8 +11,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import java.io.ObjectStreamException; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/StaticValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/StaticValue.java index 360034367d3..85ed05e0514 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/StaticValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/StaticValue.java @@ -1,14 +1,14 @@ package mage.abilities.dynamicvalue.common; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.IntStream; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.game.Game; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.IntStream; - public class StaticValue implements DynamicValue { private static final List staticValues = new ArrayList(); diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java index c5d726167e5..498356064b9 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java @@ -2,6 +2,8 @@ package mage.abilities.dynamicvalue.common; +import java.io.ObjectStreamException; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -9,8 +11,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import java.io.ObjectStreamException; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/abilities/effects/ApplyCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/ApplyCountersEffect.java index 61d76e02153..687e99bfc5c 100644 --- a/Mage/src/main/java/mage/abilities/effects/ApplyCountersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/ApplyCountersEffect.java @@ -2,12 +2,12 @@ package mage.abilities.effects; +import mage.abilities.Ability; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; import mage.counters.BoostCounter; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/AsThoughEffect.java b/Mage/src/main/java/mage/abilities/effects/AsThoughEffect.java index 1c58869db36..942c768730f 100644 --- a/Mage/src/main/java/mage/abilities/effects/AsThoughEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/AsThoughEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects; import java.util.UUID; + import mage.abilities.Ability; import mage.constants.AsThoughEffectType; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java index a21b0e3a25e..4ffe0728a77 100644 --- a/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java @@ -1,5 +1,7 @@ package mage.abilities.effects; +import java.util.UUID; + import mage.abilities.Ability; import mage.constants.AsThoughEffectType; import mage.constants.Duration; @@ -7,8 +9,6 @@ import mage.constants.EffectType; import mage.constants.Outcome; import mage.game.Game; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/AsThoughManaEffect.java b/Mage/src/main/java/mage/abilities/effects/AsThoughManaEffect.java index 54ac888207c..0cd3fab0300 100644 --- a/Mage/src/main/java/mage/abilities/effects/AsThoughManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/AsThoughManaEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects; import java.util.UUID; + import mage.abilities.Ability; import mage.constants.ManaType; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java index 2369835049a..a18bbf36bd7 100644 --- a/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java @@ -1,12 +1,18 @@ package mage.abilities.effects; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.Card; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.SpellAbilityType; +import mage.constants.SubType; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -17,8 +23,6 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; -import java.util.UUID; - /** * Cards with the Aura subtype don't change the zone they are in, if there is no * valid target on the battlefield. Also, when entering the battlefield and it diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffect.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffect.java index cdea7ccc337..c05a810870d 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffect.java @@ -1,5 +1,10 @@ package mage.abilities.effects; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.constants.DependencyType; @@ -9,11 +14,6 @@ import mage.constants.SubLayer; import mage.game.Game; import mage.target.targetpointer.TargetPointer; -import java.util.EnumSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java index 7e1cfad7480..de7f6b523e4 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java @@ -1,5 +1,12 @@ package mage.abilities.effects; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.CompoundAbility; @@ -9,7 +16,15 @@ import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.keyword.ChangelingAbility; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.DependencyType; +import mage.constants.Duration; +import mage.constants.EffectType; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -19,8 +34,6 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.targetpointer.TargetPointer; -import java.util.*; - /** * @author BetaSteward_at_googlemail.com, JayDi85 */ diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java index 46708c0d2ac..68243a95b39 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java @@ -1,5 +1,23 @@ package mage.abilities.effects; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + +import org.apache.log4j.Logger; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; @@ -8,8 +26,22 @@ import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; import mage.abilities.effects.common.continuous.BecomesFaceDownCreatureEffect; import mage.abilities.effects.common.continuous.CommanderReplacementEffect; -import mage.cards.*; -import mage.constants.*; +import mage.cards.AdventureCardSpell; +import mage.cards.Card; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.cards.SplitCardHalf; +import mage.constants.AbilityType; +import mage.constants.AsThoughEffectType; +import mage.constants.CostModificationType; +import mage.constants.Duration; +import mage.constants.EffectType; +import mage.constants.Layer; +import mage.constants.ManaType; +import mage.constants.Outcome; +import mage.constants.SpellAbilityType; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -24,12 +56,6 @@ import mage.game.stack.Spell; import mage.players.ManaPoolItem; import mage.players.Player; import mage.target.common.TargetCardInHand; -import org.apache.log4j.Logger; - -import java.io.Serializable; -import java.util.*; -import java.util.Map.Entry; -import java.util.stream.Collectors; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java index 26e92886549..68f95c04485 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java @@ -1,5 +1,15 @@ package mage.abilities.effects; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.MageSingleton; @@ -8,9 +18,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; -import org.apache.log4j.Logger; - -import java.util.*; /** * @param diff --git a/Mage/src/main/java/mage/abilities/effects/Effect.java b/Mage/src/main/java/mage/abilities/effects/Effect.java index 07312ebdf1a..4c42f5a2852 100644 --- a/Mage/src/main/java/mage/abilities/effects/Effect.java +++ b/Mage/src/main/java/mage/abilities/effects/Effect.java @@ -1,5 +1,8 @@ package mage.abilities.effects; +import java.io.Serializable; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.constants.EffectType; @@ -7,9 +10,6 @@ import mage.constants.Outcome; import mage.game.Game; import mage.target.targetpointer.TargetPointer; -import java.io.Serializable; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/EffectImpl.java b/Mage/src/main/java/mage/abilities/effects/EffectImpl.java index 65e0bbada81..44601c25092 100644 --- a/Mage/src/main/java/mage/abilities/effects/EffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/EffectImpl.java @@ -1,5 +1,9 @@ package mage.abilities.effects; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.abilities.MageSingleton; import mage.abilities.Mode; import mage.constants.EffectType; @@ -7,10 +11,6 @@ import mage.constants.Outcome; import mage.target.targetpointer.FirstTargetPointer; import mage.target.targetpointer.TargetPointer; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/Effects.java b/Mage/src/main/java/mage/abilities/effects/Effects.java index 8d3d81db548..ae42438618a 100644 --- a/Mage/src/main/java/mage/abilities/effects/Effects.java +++ b/Mage/src/main/java/mage/abilities/effects/Effects.java @@ -1,12 +1,12 @@ package mage.abilities.effects; +import java.util.ArrayList; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.constants.Outcome; import mage.target.targetpointer.TargetPointer; -import java.util.ArrayList; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/PlaneswalkerRedirectionEffect.java b/Mage/src/main/java/mage/abilities/effects/PlaneswalkerRedirectionEffect.java index 2257545f9e5..af5a9a15a64 100644 --- a/Mage/src/main/java/mage/abilities/effects/PlaneswalkerRedirectionEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/PlaneswalkerRedirectionEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.constants.Duration; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/RequirementEffect.java b/Mage/src/main/java/mage/abilities/effects/RequirementEffect.java index a0ea8297392..fa1255c6e16 100644 --- a/Mage/src/main/java/mage/abilities/effects/RequirementEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/RequirementEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects; import java.util.UUID; + import mage.abilities.Ability; import mage.constants.Duration; import mage.constants.EffectType; diff --git a/Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java b/Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java index 54a873fb9ca..a07fbdc44ba 100644 --- a/Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects; import java.util.UUID; + import mage.abilities.Ability; import mage.constants.Duration; import mage.constants.EffectType; diff --git a/Mage/src/main/java/mage/abilities/effects/common/AddCombatAndMainPhaseEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddCombatAndMainPhaseEffect.java index cee84d732b6..dcd535ebf9d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AddCombatAndMainPhaseEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AddCombatAndMainPhaseEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/AddContinuousEffectToGame.java b/Mage/src/main/java/mage/abilities/effects/common/AddContinuousEffectToGame.java index 963a4fc4b81..daba5dfbdd7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AddContinuousEffectToGame.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AddContinuousEffectToGame.java @@ -2,10 +2,10 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java index 81eab7e7670..5f74e795a61 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java @@ -5,6 +5,9 @@ */ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ReplacementEffectImpl; @@ -23,9 +26,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; -import java.util.ArrayList; -import java.util.List; - /** * Effect for the AmplifyAbility *

diff --git a/Mage/src/main/java/mage/abilities/effects/common/AttacksIfAbleTargetPlayerSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AttacksIfAbleTargetPlayerSourceEffect.java index aea698d1418..a0b4931c40f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AttacksIfAbleTargetPlayerSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AttacksIfAbleTargetPlayerSourceEffect.java @@ -1,13 +1,13 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - public class AttacksIfAbleTargetPlayerSourceEffect extends RequirementEffect { public AttacksIfAbleTargetPlayerSourceEffect() { diff --git a/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java index 2725b186366..80d555f013a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.constants.AsThoughEffectType; @@ -7,8 +9,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.game.Game; -import java.util.UUID; - public class CanBlockAsThoughtItHadShadowEffect extends AsThoughEffectImpl { public CanBlockAsThoughtItHadShadowEffect(Duration duration) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java index ea38ed40768..986cb862ae5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.Objects; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java index c51b17ab5c4..74dba0b6280 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.Set; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java index 4354f0904da..89ef6f40561 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java @@ -6,6 +6,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java index c1bdd3f9f48..df8496f2971 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseExpansionSetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseExpansionSetEffect.java index 8100a81ac6d..c436aa24ff2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseExpansionSetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseExpansionSetEffect.java @@ -4,6 +4,7 @@ package mage.abilities.effects.common; import java.util.HashSet; import java.util.List; import java.util.Set; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseLandTypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseLandTypeEffect.java index a078a57c80d..3e50671319f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseLandTypeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseLandTypeEffect.java @@ -5,6 +5,8 @@ */ package mage.abilities.effects.common; +import java.util.stream.Collectors; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -17,8 +19,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.CardUtil; -import java.util.stream.Collectors; - /** * @author fireshoes */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java index 5189e93f9ad..1563422f5c6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java @@ -4,6 +4,7 @@ package mage.abilities.effects.common; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.choices.Choice; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java index 72b22fc266e..ec659221dc3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java @@ -1,12 +1,13 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.cards.Card; @@ -19,8 +20,6 @@ import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTarget; -import java.util.UUID; - /** * FAQ 2013/01/11 *

diff --git a/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java index 182b6e583f3..4b81ea7ab33 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.io.ObjectStreamException; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.MageSingleton; @@ -18,8 +20,6 @@ import mage.players.PlayerList; import mage.target.Target; import mage.target.common.TargetOpponent; -import java.io.ObjectStreamException; - /** * 1. The controller of the spell or ability chooses an opponent. (This doesn't * target the opponent.) 2. Each player involved in the clash reveals the top 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 d75fda572eb..ae8a1861e4f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java @@ -1,19 +1,27 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; -import mage.constants.*; +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.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentCard; import mage.game.permanent.PermanentToken; import mage.util.functions.ApplyToPermanent; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java index 3485c7c4f94..a2327fc37a4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -19,8 +21,6 @@ import mage.target.TargetPermanent; import mage.util.functions.ApplyToPermanent; import mage.util.functions.EmptyApplyToPermanent; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java index dccf10bc179..34f86675145 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java @@ -1,5 +1,14 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + import mage.MageItem; import mage.MageObject; import mage.abilities.Ability; @@ -17,8 +26,6 @@ import mage.target.Target; import mage.target.TargetImpl; import mage.util.TargetAddress; -import java.util.*; - /** * @param * @author duncant 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 63b3018d234..1472f5eec79 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java @@ -2,7 +2,13 @@ package mage.abilities.effects.common; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java index 87ab736ab1e..b8259d7ff7c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java index 86ac6ae39f4..e6e978033f5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetEffect.java index 144bb81b448..e4569569fd7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java index acc93941dca..f06a9a2b860 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; @@ -11,7 +15,11 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.EmptyToken; @@ -20,10 +28,6 @@ import mage.util.CardUtil; import mage.util.functions.ApplyToPermanent; import mage.util.functions.EmptyApplyToPermanent; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java index 0ee482597c0..f755b8fc73f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java @@ -1,6 +1,10 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; @@ -15,10 +19,6 @@ import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java index d74b91930b5..989dbc16804 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java @@ -7,7 +7,6 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.game.Game; -import mage.game.permanent.token.TokenImpl; import mage.game.permanent.token.Token; import mage.util.CardUtil; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java index ac3bf171bb9..c27f5ce75c5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java @@ -1,9 +1,9 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java index 8dffba358d0..3267ed07236 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.List; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java index 19772872398..692b425e515 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java @@ -2,12 +2,12 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java index 54db753781e..86546494e07 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; @@ -11,9 +14,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java index 9dc0f94e177..4c30b4ab80f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.Mode; @@ -12,10 +16,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java index 01d581c38e3..3e34399d261 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; @@ -9,8 +11,6 @@ import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java index 31e471ad782..df5c59ac8bf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java @@ -1,10 +1,10 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java index d4db66bb450..4c19f56d95b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; @@ -12,8 +14,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com * @author North diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedEquipmentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedEquipmentEffect.java index b55a48f3e95..58cc9b8e58d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedEquipmentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedEquipmentEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java index ef481718436..df2a3ff9e8e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java @@ -2,9 +2,9 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java index 6d833155850..5220091b2ba 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java @@ -6,6 +6,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyMultiTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyMultiTargetEffect.java index 3a8f2b90ab1..d640ad1197c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyMultiTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyMultiTargetEffect.java @@ -3,10 +3,11 @@ package mage.abilities.effects.common; import java.util.Iterator; import java.util.UUID; -import mage.constants.Outcome; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java index 6ac8f7ab1c1..e9f5bc6cbf6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -11,8 +13,6 @@ import mage.target.targetpointer.FirstTargetPointer; import mage.target.targetpointer.SecondTargetPointer; import mage.util.CardUtil; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java index 99c5c5b07bb..d721048074c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.RestrictionEffect; @@ -12,10 +16,6 @@ import mage.game.permanent.Permanent; import mage.game.turn.Step; import mage.target.targetpointer.FixedTarget; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java index b4e169e8075..cd11ab1b026 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -14,8 +16,6 @@ import mage.target.Target; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java index d2d8a6a7d21..11d715c9894 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java @@ -1,5 +1,10 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ReplacementEffectImpl; @@ -17,11 +22,6 @@ import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.util.SubTypeList; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; - /** * Effect for the DevourAbility *

diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java index d231598bf07..05549fd0150 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.Locale; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -13,8 +15,6 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import java.util.Locale; - public class DoIfCostPaid extends OneShotEffect { protected Effects executingEffects = new Effects(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java index 28d2dda59d4..78ea5e4c003 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -15,8 +17,6 @@ import mage.players.Player; import mage.util.CardUtil; import mage.util.ManaUtil; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java index 41200f26f0f..65a47bfa0c2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java @@ -4,6 +4,7 @@ package mage.abilities.effects.common; import java.util.HashMap; import java.util.Map; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java index dbc5aa6ad14..14c722f5baf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java index 0e87c451e8c..29bfd1c5e65 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java index c56ae3840ba..947479157bc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java index 0bec69cbc82..fdc0c3a9fb5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.Locale; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java index 2d3a8c5639c..3924e6b55a9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java @@ -5,13 +5,14 @@ */ package mage.abilities.effects.common; +import static mage.constants.Outcome.Benefit; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.constants.Duration; import mage.constants.Outcome; -import static mage.constants.Outcome.Benefit; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java index 486bbe1296f..aed524617e7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java @@ -1,6 +1,10 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.EntersBattlefieldEffect; @@ -11,10 +15,6 @@ import mage.counters.Counter; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * Use this effect only (I guess) with EntersBattlefieldAbility like abilities * diff --git a/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java index cd58b7ac8c6..7f086368066 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java @@ -5,6 +5,7 @@ package mage.abilities.effects.common; import java.util.Objects; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java index 9c664bbf25f..dfd4613d3c8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.MageSingleton; import mage.abilities.effects.AsThoughEffectImpl; @@ -17,8 +19,6 @@ import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; -import java.util.UUID; - /** * @author phulin */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java index 271d004bf45..9bea860b3d6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java @@ -3,9 +3,10 @@ package mage.abilities.effects.common; import java.util.List; import java.util.UUID; -import mage.constants.Outcome; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java index f2f8de4a1fc..b88d11376de 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -11,8 +13,6 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.util.CardUtil; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java index 8f4aed65f26..2aa6741d518 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.Locale; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardsImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java index b3d65f87753..fdd4664616e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Cards; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java index 4c8858e67c3..f6bbc682532 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java @@ -4,6 +4,7 @@ package mage.abilities.effects.common; import java.util.ArrayList; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java index 0410d7af388..60d5be3037b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java index eadcce35a41..3f3b5062bbf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java index edff90134bf..c0777c601a9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.search.SearchTargetGraveyardHandLibraryForCardNameAndExileEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java index 0d1285a3f91..c051ba24334 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java index bee973d5546..6ef3475503c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.common; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -12,10 +16,6 @@ import mage.target.Target; import mage.target.targetpointer.FirstTargetPointer; import mage.util.CardUtil; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java index 22fdb166fe5..2ec8e9b27db 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -8,8 +10,6 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java index 105097a6678..cca57cad012 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java @@ -2,11 +2,11 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java index 98210835fbf..dcbcec75224 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java @@ -2,17 +2,17 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java index 527a1f1c901..1242d9f8af3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.List; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java index a99b93a6f30..9e89b72bb12 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.stream.Collectors; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -9,8 +11,6 @@ import mage.game.Game; import mage.game.command.Emblem; import mage.players.Player; -import java.util.stream.Collectors; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java index 82e095daec1..8bfdd00956d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common; +import java.util.Set; +import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -11,9 +14,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.CardUtil; -import java.util.Set; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java index d3b3681f2fa..9a4a26e9546 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java @@ -2,11 +2,11 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index 9dca85f4064..8deb723642b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -29,6 +29,10 @@ */ package mage.abilities.effects.common; +import static java.lang.Integer.min; + +import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; @@ -43,10 +47,6 @@ import mage.players.Player; import mage.target.TargetCard; import mage.util.CardUtil; -import java.util.Locale; - -import static java.lang.Integer.min; - /** * @author LevelX */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java index 01bb92c2ee4..553fba61750 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java @@ -2,9 +2,9 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java index 0707a453340..ad8b94b5010 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java @@ -2,11 +2,11 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java index 6c009e9ed39..97f09080f37 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java @@ -1,12 +1,12 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java index 93c03a71466..db108f08458 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java index 01e7308f021..42f2dc773ef 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -12,9 +15,6 @@ import mage.game.events.GameEvent; import mage.game.events.ManaEvent; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java index 7713284c963..8071b49c5dc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java @@ -4,6 +4,7 @@ package mage.abilities.effects.common; 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; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java index 6ffb908c433..36ad199159c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java @@ -2,9 +2,9 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java index a21ec943842..5dde8a59a9c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java index 79dce240e23..273926eea4b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java @@ -6,6 +6,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java index 24922cae10c..7029f63d832 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java @@ -1,11 +1,12 @@ package mage.abilities.effects.common; +import static mage.constants.Duration.EndOfTurn; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.PreventionEffectImpl; import mage.constants.Duration; -import static mage.constants.Duration.EndOfTurn; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java index b0d619a381e..970191cd802 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; @@ -12,8 +14,6 @@ import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java index 15a999d6f58..0054e030e17 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java @@ -1,9 +1,9 @@ package mage.abilities.effects.common; -import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java index a544a6fa829..dc808c5c39b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java @@ -2,9 +2,9 @@ package mage.abilities.effects.common; -import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java index 7038040e8f0..5ca47ed077a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java @@ -1,11 +1,12 @@ package mage.abilities.effects.common; +import static mage.constants.Duration.EndOfTurn; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.PreventionEffectImpl; import mage.constants.Duration; -import static mage.constants.Duration.EndOfTurn; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java index 18045f84aaf..20fd386f885 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java @@ -1,11 +1,11 @@ package mage.abilities.effects.common; -import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.PreventionEffectImpl; +import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java index 7aa79be735a..37bec672316 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -15,10 +19,6 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetAmount; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java index 8f1455f2ab2..cd60f7498fe 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java @@ -1,6 +1,11 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -14,11 +19,6 @@ import mage.players.Player; import mage.target.Target; import mage.util.CardUtil; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java index 9cd5fa87023..1febe3a7fad 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RegenerateAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateAttachedEffect.java index 8e259eba9e6..f14b3e37731 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RegenerateAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RegenerateAttachedEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.Locale; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.constants.AttachmentType; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceEffect.java index 9bd10c46457..2d6a475fba5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceEffect.java @@ -2,10 +2,10 @@ package mage.abilities.effects.common; -import mage.constants.Duration; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; +import mage.constants.Duration; +import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java index 8d1fc9ba7af..763e5fb53ed 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java index 957872623b9..1bdc6a328bf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java @@ -3,9 +3,10 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.constants.Outcome; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java index 17e9449b64e..6cfcc1bcc88 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RemoveSpecialActionEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RemoveSpecialActionEffect.java index 757dd1dc951..475ed61272c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RemoveSpecialActionEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RemoveSpecialActionEffect.java @@ -3,10 +3,11 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.constants.Outcome; + import mage.abilities.Ability; import mage.abilities.SpecialAction; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java index af77e9b1c3e..b0ec223b719 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java @@ -2,7 +2,9 @@ package mage.abilities.effects.common; import static java.lang.Integer.min; + import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnCreaturesFromExileEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnCreaturesFromExileEffect.java index a33ef0f2d45..2bf820b0024 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnCreaturesFromExileEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnCreaturesFromExileEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileEffect.java index 8cceded80f7..7ac3dee7871 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java index 7bd9d4350ea..966fa920617 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import org.apache.log4j.Logger; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -10,7 +12,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.CardUtil; -import org.apache.log4j.Logger; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java index b86191c5155..58e55642d30 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -11,10 +15,6 @@ import mage.players.Player; import mage.target.Target; import mage.util.CardUtil; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java index db66028de22..5a42ba942a8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -13,8 +15,6 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java index b504ce2d975..f73bfa24ea0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java index 25936223ddb..2d95d8a5966 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -13,8 +15,6 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import java.util.UUID; - /** * @author noxx */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandAttachedEffect.java index 0e39a35540b..bbf11b1c94f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandAttachedEffect.java @@ -1,9 +1,9 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; +import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java index 679b857829e..2892bea74a1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.HashSet; import java.util.Set; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java index 9d89562071f..3eac6b55954 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java index 6f932960ff0..98e65cbd754 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -1,5 +1,11 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -13,8 +19,6 @@ import mage.players.Player; import mage.target.Target; import mage.util.CardUtil; -import java.util.*; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealHandSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealHandSourceControllerEffect.java index c3e5e59e888..cbbff8ad398 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealHandSourceControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealHandSourceControllerEffect.java @@ -5,7 +5,6 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java index c77e3560f4d..3e7ef08ab76 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.Set; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RollPlanarDieEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RollPlanarDieEffect.java index dcd4a797d35..74d0a0f07d1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RollPlanarDieEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RollPlanarDieEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.List; import java.util.stream.Collectors; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java index 434ebc82259..3a35c934d56 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java @@ -1,6 +1,10 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; @@ -13,10 +17,6 @@ import mage.players.Player; import mage.target.common.TargetControlledPermanent; import mage.util.CardUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java index fc954a3a5d1..d214e044b18 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEquippedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEquippedEffect.java index a020e71d751..68739f1f845 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEquippedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEquippedEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java index 52b840747fd..ddfdeb2a221 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java index f3e764b4437..f29f1077465 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.common; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; @@ -17,10 +21,6 @@ import mage.target.TargetPermanent; import mage.util.CardUtil; import mage.util.ManaUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author Eirkei */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java index 4560aeeb6be..136ce8dc96a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.Cost; @@ -13,8 +15,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.util.ManaUtil; -import java.util.Locale; - /** * Created by IntelliJ IDEA. User: Loki Date: 21.12.10 Time: 9:21 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java index c5da5402971..812603886e8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java index cb691a322ad..c01aa4975aa 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java @@ -6,6 +6,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ShuffleHandGraveyardAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleHandGraveyardAllEffect.java index e764cc92166..8b15b224f83 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleHandGraveyardAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleHandGraveyardAllEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java index bbd77b2e8d4..14c275ea7ce 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SkipNextDrawStepControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipNextDrawStepControllerEffect.java index f498b90eebb..aec92050a3d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SkipNextDrawStepControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SkipNextDrawStepControllerEffect.java @@ -30,7 +30,6 @@ package mage.abilities.effects.common; import mage.abilities.Ability; -import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.constants.PhaseStep; diff --git a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java index 66c97e162ff..62449eafa47 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java @@ -29,11 +29,11 @@ */ package mage.abilities.effects.common; -import mage.constants.Outcome; -import mage.constants.PhaseStep; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; +import mage.constants.PhaseStep; import mage.game.Game; import mage.game.turn.TurnMod; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapAllEffect.java index bee5b365ba8..2289dba62fa 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapAllEffect.java @@ -2,9 +2,9 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java index 421b2c2bc91..4389202492d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.List; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java index e3aa5c5c56b..1be1f7fdef7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/TurnFaceUpTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TurnFaceUpTargetEffect.java index e3fbd63110b..1fde321b16f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TurnFaceUpTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TurnFaceUpTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/UnlessPaysDelayedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UnlessPaysDelayedEffect.java index 61fc84a6f76..0be1cedc371 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UnlessPaysDelayedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UnlessPaysDelayedEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java index 595fed8dc69..83340b819b8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java @@ -1,9 +1,9 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapAllThatAttackedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapAllThatAttackedEffect.java index 385ff814ec8..4da2152e07e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapAllThatAttackedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapAllThatAttackedEffect.java @@ -2,13 +2,13 @@ package mage.abilities.effects.common; import java.util.Set; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.watchers.Watcher; import mage.watchers.common.AttackedThisTurnWatcher; /** diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapEnchantedEffect.java index ca6f69d2a16..acb1bf3739d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapEnchantedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapEnchantedEffect.java @@ -2,9 +2,9 @@ package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java index f1ab28e27a0..a2695226fb4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java index 2c7d0601446..c2d5ae3a54d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -9,8 +11,6 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.util.CardUtil; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java b/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java index 074459a3850..c09311a9a36 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common; +import java.util.List; +import java.util.Set; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -13,9 +16,6 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; -import java.util.List; -import java.util.Set; - /** * @author Styxo */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneAllEffect.java index 5b3927f2139..0dd40ebd9a8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneAllEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common.asthought; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneTargetEffect.java index ec878eb5b14..06af7dc1131 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/asthought/PlayFromNotOwnHandZoneTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.asthought; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.constants.AsThoughEffectType; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/AttackIfAbleTargetRandomOpponentSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttackIfAbleTargetRandomOpponentSourceEffect.java index 8d49f4525bc..1c5374ba18c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/AttackIfAbleTargetRandomOpponentSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/AttackIfAbleTargetRandomOpponentSourceEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.common.combat; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -10,10 +14,6 @@ import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - public class AttackIfAbleTargetRandomOpponentSourceEffect extends OneShotEffect { public AttackIfAbleTargetRandomOpponentSourceEffect() { diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderAllEffect.java index d3b865179db..4b9fb734922 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderAllEffect.java @@ -1,6 +1,8 @@ package mage.abilities.effects.common.combat; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.constants.AsThoughEffectType; @@ -11,8 +13,6 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author Quercitron */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java index 40e19ce7260..aa6ab1532a0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.combat; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.constants.AsThoughEffectType; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderTargetEffect.java index f21719649a2..bd257182037 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.combat; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.AsThoughEffectImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java index 605da5354c3..dd8f9979771 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.combat; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.AttachmentType; @@ -7,8 +9,6 @@ import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author LevelX2 diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java index 21f0fece9a4..dafad4e2713 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.combat; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -8,8 +10,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.UUID; - /** * @author BursegSardaukar */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java index f783c08a55e..7531f3513a5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.combat; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -8,8 +10,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java index b47fd8d748b..4c4409aa1a0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.combat; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -9,8 +11,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java index cdd9e6b0b2b..800f227ba59 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java @@ -1,13 +1,13 @@ package mage.abilities.effects.common.combat; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java index 7bc79625d7c..7a158284bbc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.combat; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -8,8 +10,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author fireshoes */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllTargetEffect.java index 1448aacf277..256cb738189 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllTargetEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.combat; +import static mage.constants.Duration.EndOfTurn; + import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -7,8 +9,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import static mage.constants.Duration.EndOfTurn; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java index dc4d48bf541..0b80d61e9e7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java @@ -1,17 +1,15 @@ package mage.abilities.effects.common.combat; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffectImpl; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; - - import mage.util.CardUtil; /** diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java index 737511b0e8a..1599471c59b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java @@ -1,15 +1,13 @@ package mage.abilities.effects.common.combat; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; - - import mage.game.permanent.Permanent; import mage.util.CardUtil; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java index 4629f6ed64f..6b1be8d98cf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java @@ -1,12 +1,12 @@ package mage.abilities.effects.common.combat; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffectImpl; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java index 326af72f953..5661ba9c5c9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java @@ -1,12 +1,12 @@ package mage.abilities.effects.common.combat; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneTargetEffect.java index 35083b04a51..5df7ac637bf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.combat; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java index c3a680b7712..117f2b0955a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.combat; +import static mage.constants.Duration.EndOfTurn; + import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.AttachmentType; @@ -9,8 +11,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; -import static mage.constants.Duration.EndOfTurn; - /** * @author North */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java index 38fccf97aaf..40379cece3e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.combat; import java.util.Locale; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.constants.AttachmentType; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java index 4f4fc76fe66..3b8d2fa351d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java @@ -1,9 +1,10 @@ package mage.abilities.effects.common.combat; import java.util.UUID; -import mage.constants.Duration; + import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; +import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java index d8806469c3d..7864b737fd0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.combat; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.constants.AbilityType; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java index 7375856341d..31e85c23420 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.combat; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java index 76614f818ed..1884ab677ec 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.combat; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java index d56b0e8b0ec..7a3c78ab2a5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.combat; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/ActivateAbilitiesAnyTimeYouCouldCastInstantEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/ActivateAbilitiesAnyTimeYouCouldCastInstantEffect.java index d15adb8048b..7356bce5891 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/ActivateAbilitiesAnyTimeYouCouldCastInstantEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/ActivateAbilitiesAnyTimeYouCouldCastInstantEffect.java @@ -6,6 +6,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.constants.AsThoughEffectType; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java index 665b9783f2a..32df47b1d65 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java @@ -5,7 +5,11 @@ package mage.abilities.effects.common.continuous; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.AttachmentType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java index cf3e77643ca..9dc22369054 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java @@ -4,7 +4,11 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java index 66bfc9bf0ae..35112e9078f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java @@ -4,7 +4,12 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.DependencyType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java index a98ade7d822..42386bb41e5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java @@ -4,7 +4,12 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.AttachmentType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSuperTypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSuperTypeAttachedEffect.java index 641916af887..fdd13ff6811 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSuperTypeAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSuperTypeAttachedEffect.java @@ -2,9 +2,15 @@ package mage.abilities.effects.common.continuous; import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.AttachmentType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java index a09b001d53f..7a9e8ed45de 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java @@ -3,7 +3,12 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +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.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java index 00892f24aa6..7bd81902479 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeSourceEffect.java @@ -3,11 +3,17 @@ package mage.abilities.effects.common.continuous; import java.util.ArrayList; import java.util.Locale; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +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.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java index b8f09330394..5d0f586aac0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java @@ -4,6 +4,7 @@ package mage.abilities.effects.common.continuous; import java.util.ArrayList; import java.util.Locale; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java index cf8c158d7bb..bbafc16860e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java @@ -3,7 +3,11 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.ChooseCreatureTypeEffect; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAllBasicsControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAllBasicsControlledEffect.java index 693c71b5ed1..fbb635fa6b2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAllBasicsControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAllBasicsControlledEffect.java @@ -1,16 +1,25 @@ package mage.abilities.effects.common.continuous; +import java.util.Collection; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.mana.*; -import mage.constants.*; +import mage.abilities.mana.BasicManaAbility; +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.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.Collection; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java index ebf958615d5..73cbc9277cb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java @@ -1,16 +1,24 @@ package mage.abilities.effects.common.continuous; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.mana.*; -import mage.constants.*; -import mage.game.Game; -import mage.game.permanent.Permanent; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; +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.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.game.Game; +import mage.game.permanent.Permanent; + public class BecomesBasicLandEnchantedEffect extends ContinuousEffectImpl { protected List landTypes = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java index 23de1a78d96..10422aede5d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java @@ -1,20 +1,30 @@ package mage.abilities.effects.common.continuous; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.mana.*; -import mage.choices.Choice; -import mage.choices.ChoiceBasicLandType; -import mage.constants.*; -import mage.game.Game; -import mage.game.permanent.Permanent; -import mage.players.Player; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; +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.choices.Choice; +import mage.choices.ChoiceBasicLandType; +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.SubType; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; + /** * http://mtgsalvation.gamepedia.com/Land_changers * diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBlackZombieAdditionEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBlackZombieAdditionEffect.java index 6e448439b10..1c37f761bdf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBlackZombieAdditionEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBlackZombieAdditionEffect.java @@ -3,7 +3,11 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorAllEffect.java index f5cefeefbf5..b7b3699e11c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorAllEffect.java @@ -29,21 +29,20 @@ */ package mage.abilities.effects.common.continuous; -import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; import mage.choices.ChoiceColor; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.stack.Spell; import mage.players.Player; -import java.util.UUID; - /** * @author LevelX */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java index 6820e727ff4..d0c527f4e0e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java @@ -30,6 +30,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java index 709fca771a7..154364d2d74 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java @@ -1,18 +1,24 @@ package mage.abilities.effects.common.continuous; +import java.util.HashSet; +import java.util.Set; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; -import java.util.HashSet; -import java.util.Set; - /** * @author LevelX2 */ 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 2a740326103..20be92042af 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 @@ -2,7 +2,13 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java index 16b27519ee6..18472e938ee 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java @@ -3,7 +3,13 @@ package mage.abilities.effects.common.continuous; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java index 43915d9ac74..c88c9d20ea6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java @@ -2,7 +2,12 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java index 09a34e730b4..f467b86a66a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java @@ -4,7 +4,13 @@ import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +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.SubType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java index 07151c6fa4e..b0d9766d0b0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java @@ -1,17 +1,23 @@ package mage.abilities.effects.common.continuous; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.SuperType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.Target; import mage.util.CardUtil; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java index 839f691d217..155b1caa321 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java @@ -5,15 +5,19 @@ */ package mage.abilities.effects.common.continuous; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.SubTypeList; -import java.util.UUID; - /** * @author LevelX2 */ 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 d91a9a4d3d4..ed9d7333e10 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 @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; + import mage.MageObjectReference; import mage.ObjectColor; import mage.abilities.Ability; 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 34713777886..47b2e0c07f5 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 @@ -3,6 +3,7 @@ package mage.abilities.effects.common.continuous; import java.util.ArrayList; import java.util.List; + import mage.MageObjectReference; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesSubtypeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesSubtypeAllEffect.java index 97f506cbf34..71ce9cbb239 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesSubtypeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesSubtypeAllEffect.java @@ -7,7 +7,11 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java index bf1261f9266..06183984c6d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.continuous; import java.util.Iterator; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java index 901fd633357..bd43f4f441d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.continuous; import java.util.Iterator; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java index 1e9c895a254..b9858ab344f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java @@ -1,14 +1,14 @@ package mage.abilities.effects.common.continuous; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java index 22208383088..b6a37cebd8c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java @@ -1,6 +1,10 @@ package mage.abilities.effects.common.continuous; import java.util.Iterator; +import java.util.Set; +import java.util.UUID; + +import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; @@ -11,10 +15,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.Set; -import java.util.UUID; -import mage.MageObjectReference; - public class BoostOpponentsEffect extends ContinuousEffectImpl { protected int power; protected int toughness; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceEffect.java index 1cfa40263a4..6c45fd53445 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceEffect.java @@ -2,6 +2,8 @@ package mage.abilities.effects.common.continuous; +import org.apache.log4j.Logger; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -13,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; -import org.apache.log4j.Logger; /** * diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java index 4bc2ec8b966..43572319e2e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java @@ -2,13 +2,13 @@ package mage.abilities.effects.common.continuous; +import mage.abilities.Ability; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; +import mage.abilities.effects.WhileConditionContinuousEffect; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; -import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.effects.WhileConditionContinuousEffect; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java index 438fce895fa..90e4e45e7f2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java @@ -1,6 +1,9 @@ package mage.abilities.effects.common.continuous; +import java.util.Locale; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; @@ -15,9 +18,6 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.util.CardUtil; -import java.util.Locale; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeAllEffect.java index cad436d0ebf..25f9eb64e59 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeAllEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeTargetEffect.java index 06d15e343a0..016c0901769 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java index 762e6539aef..10a1cc38711 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashSourceEffect.java index 17f4fdb1412..bfcc4d3f30e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashSourceEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.constants.AsThoughEffectType; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java index a330989828c..37bdeae4aee 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastFromHandWithoutPayingManaCostEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.continuous; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.condition.CompoundCondition; @@ -9,15 +11,17 @@ import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; import mage.cards.SplitCardHalf; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; -import java.util.UUID; - public class CastFromHandWithoutPayingManaCostEffect extends ContinuousEffectImpl { private final FilterCard filter; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java index bebace3682d..f553cc0f6fb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java index 399cd4c72af..0e066bc8946 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common.continuous; +import java.util.Locale; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; @@ -13,9 +16,6 @@ import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; -import java.util.Locale; -import java.util.UUID; - /** * @author Plopman, JayDi85 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java index ecdac7e6679..296c5fb49f4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java index cbb62be79a9..e7917875374 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java @@ -1,5 +1,10 @@ package mage.abilities.effects.common.continuous; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; @@ -7,16 +12,15 @@ import mage.abilities.Mode; import mage.abilities.TriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Locale; -import java.util.UUID; - /** * @author Loki */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java index 1b6395382bb..fbac9f10efb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java @@ -2,7 +2,11 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.AttachmentType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java index 25616f7cd43..35503aac4c3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java @@ -1,20 +1,24 @@ package mage.abilities.effects.common.continuous; +import java.util.HashMap; +import java.util.Iterator; +import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.CompoundAbility; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.HashMap; -import java.util.Iterator; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java index 63cd9898d28..b19728f99d9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java @@ -2,12 +2,12 @@ package mage.abilities.effects.common.continuous; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java index 5647423c5d7..d310348215f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java @@ -1,17 +1,21 @@ package mage.abilities.effects.common.continuous; +import java.util.Locale; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; -import java.util.Locale; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlAllEffect.java index 66c82fdab3f..06336cb79e2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlAllEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java index c418dadd407..d42462380a6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromTypeTargetEffect.java index d2e00db5360..8f0103c884b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromTypeTargetEffect.java @@ -2,9 +2,9 @@ package mage.abilities.effects.common.continuous; -import mage.constants.Duration; import mage.abilities.Ability; import mage.abilities.keyword.ProtectionAbility; +import mage.constants.Duration; import mage.filter.FilterCard; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java index fd56dcee2b9..9e3ac76dd68 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.continuous; import java.util.HashMap; import java.util.Iterator; import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java index 9c43b5c4c3c..4493c22ddf4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java @@ -2,12 +2,17 @@ package mage.abilities.effects.common.continuous; +import org.apache.log4j.Logger; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.AttachmentType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; -import org.apache.log4j.Logger; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java index 44f6031387c..ca71a10fd52 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.continuous; import java.util.HashSet; import java.util.Set; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.choices.ChoiceImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java index f8fa800f084..51d309bb3a8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.continuous; import java.util.Iterator; + import mage.abilities.Ability; import mage.abilities.MageSingleton; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java index c8547b027ee..d63c669c139 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java @@ -2,18 +2,18 @@ package mage.abilities.effects.common.continuous; +import java.util.UUID; + +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; -import mage.abilities.Mode; -import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * * @author nantuko diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllCreatureTypesTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllCreatureTypesTargetEffect.java index e913d661abc..d6e849b8cda 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllCreatureTypesTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllCreatureTypesTargetEffect.java @@ -3,7 +3,11 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java index edff38e9663..736c841fcaa 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java @@ -1,13 +1,19 @@ package mage.abilities.effects.common.continuous; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +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.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author noahg */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java index 02405a9d044..f3c7d7dea5c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java @@ -3,7 +3,12 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.CardUtil; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java index 295d99cd80e..71f49faea70 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.continuous; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java index 2d369f0f4d8..b3d01337187 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.continuous; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.cards.Card; @@ -11,8 +13,6 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import java.util.UUID; - /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithHandRevealedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithHandRevealedEffect.java index d7051b81199..5bb43994a77 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithHandRevealedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithHandRevealedEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.continuous; import java.util.ArrayList; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.ContinuousEffectImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithTheTopCardRevealedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithTheTopCardRevealedEffect.java index e813f875fa2..e1561115500 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithTheTopCardRevealedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithTheTopCardRevealedEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.continuous; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; @@ -9,8 +11,6 @@ import mage.constants.SubLayer; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardColorAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardColorAttachedEffect.java index 2d7ff33413e..8d7f8d972c1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardColorAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardColorAttachedEffect.java @@ -4,7 +4,11 @@ package mage.abilities.effects.common.continuous; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.AttachmentType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardSubtypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardSubtypeAttachedEffect.java index 05da896fff3..baea0522a7e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardSubtypeAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardSubtypeAttachedEffect.java @@ -2,7 +2,12 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.*; +import mage.constants.AttachmentType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.SubTypeList; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessAllEffect.java index edb7b8e4595..be6fa6d794e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessAllEffect.java @@ -4,6 +4,7 @@ package mage.abilities.effects.common.continuous; import java.util.Iterator; import java.util.Locale; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java index fd1f1310a97..7fa1a49433c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.continuous; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; @@ -12,8 +14,6 @@ import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessAllEffect.java index 0e071402269..4e9cdfd4fe9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessAllEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.continuous; import java.util.Iterator; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessTargetEffect.java index 3eb33e61e49..dd057182fa0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessTargetEffect.java @@ -2,13 +2,13 @@ package mage.abilities.effects.common.continuous; +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; -import mage.abilities.Ability; -import mage.abilities.Mode; -import mage.abilities.effects.ContinuousEffectImpl; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapAllDuringEachOtherPlayersUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapAllDuringEachOtherPlayersUntapStepEffect.java index bc2b0c89358..94c5271453e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapAllDuringEachOtherPlayersUntapStepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapAllDuringEachOtherPlayersUntapStepEffect.java @@ -3,7 +3,11 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.RestrictionEffect; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.SubLayer; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapSourceDuringEachOtherPlayersUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapSourceDuringEachOtherPlayersUntapStepEffect.java index 1574bfecafd..4695b0edfac 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapSourceDuringEachOtherPlayersUntapStepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapSourceDuringEachOtherPlayersUntapStepEffect.java @@ -3,7 +3,11 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.RestrictionEffect; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.SubLayer; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java index 4c36466ddfb..057bc9e1a2a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.cost; +import org.apache.log4j.Logger; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -15,7 +17,6 @@ import mage.game.Game; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInHand; -import org.apache.log4j.Logger; /** * @author fireshoes - Original Code diff --git a/Mage/src/main/java/mage/abilities/effects/common/cost/CommanderCostModification.java b/Mage/src/main/java/mage/abilities/effects/common/cost/CommanderCostModification.java index 7e6f87daf2d..05d7ca60d5a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/cost/CommanderCostModification.java +++ b/Mage/src/main/java/mage/abilities/effects/common/cost/CommanderCostModification.java @@ -1,5 +1,7 @@ package mage.abilities.effects.common.cost; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.CastCommanderAbility; import mage.abilities.common.PlayLandAsCommanderAbility; @@ -10,8 +12,6 @@ import mage.game.Game; import mage.util.ManaUtil; import mage.watchers.common.CommanderPlaysCountWatcher; -import java.util.UUID; - /** * @author Plopman */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/cost/CostModificationEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/common/cost/CostModificationEffectImpl.java index c043b741f93..ad2d2ddb7b8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/cost/CostModificationEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/common/cost/CostModificationEffectImpl.java @@ -2,13 +2,13 @@ package mage.abilities.effects.common.cost; -import mage.constants.Duration; -import mage.constants.EffectType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.CostModificationEffect; import mage.constants.CostModificationType; +import mage.constants.Duration; +import mage.constants.EffectType; +import mage.constants.Outcome; import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java index 3c79a578252..9db8702b9d4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.cost; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.SpellAbility; diff --git a/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionControllerEffect.java index 1fd38caa062..8b8077f610d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionControllerEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.cost; import java.util.LinkedHashSet; import java.util.Set; + import mage.MageObject; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAllEffect.java index 5118f362b9a..0da7d6447f3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAllEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.counter; import java.util.Locale; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java index 8854bc43283..2d873d68453 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.common.counter; import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersControllerEffect.java index b08cd93997e..6e1b8f63cff 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersControllerEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.counter; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java index 208a4c0b1ec..29e5a0aaaa8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.counter; import java.util.ArrayList; import java.util.Locale; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java index b3166e83b5f..8d1f27caa13 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common.counter; +import java.util.Locale; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -16,9 +19,6 @@ import mage.players.Player; import mage.target.Target; import mage.util.CardUtil; -import java.util.Locale; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java index eebf00a528f..c8066d8cbca 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java @@ -2,10 +2,10 @@ package mage.abilities.effects.common.counter; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java index ba836e76ad0..8213f5c1a02 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java @@ -1,10 +1,10 @@ package mage.abilities.effects.common.counter; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java index 469b1126642..40596f4daad 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java @@ -4,6 +4,7 @@ package mage.abilities.effects.common.counter; import java.util.ArrayList; import java.util.List; import java.util.Locale; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java index 39315588d45..f8d368ed235 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.counter; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java index e82e3c94def..0d9c1285dd3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java @@ -1,5 +1,10 @@ package mage.abilities.effects.common.counter; +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.constants.Outcome; @@ -11,11 +16,6 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetPermanentOrPlayer; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java index 03fc51e41ca..923c0a7f4d5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.counter; import java.util.HashSet; import java.util.Set; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java index 59451c359b9..5947e9dde95 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java @@ -1,6 +1,8 @@ package mage.abilities.effects.common.counter; +import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; @@ -11,8 +13,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.CardUtil; -import java.util.Locale; - /** * * @author noahg diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java index 5e2d1d11935..1aa90e6ea06 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common.discard; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; @@ -18,9 +21,6 @@ import mage.target.TargetCard; import mage.target.common.TargetCardInHand; import mage.util.CardUtil; -import java.util.List; -import java.util.UUID; - /** * @author noxx */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java index 91ebc6228d4..28f47763f11 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common.discard; +import java.util.HashMap; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; @@ -17,9 +20,6 @@ import mage.target.Target; import mage.target.common.TargetDiscard; import mage.util.CardUtil; -import java.util.HashMap; -import java.util.UUID; - public class DiscardEachPlayerEffect extends OneShotEffect { protected DynamicValue amount; diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java index d6cb2f4eb78..de3578e9026 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common.discard; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -7,9 +10,6 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import java.util.Set; -import java.util.UUID; - /** * @author mluds */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java index cb1b992fe5b..db511a7a60f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.discard; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java index 66b1351f340..034058ae6ff 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.discard; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/main/java/mage/abilities/effects/common/enterAttribute/EnterAttributeAddChosenSubtypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/enterAttribute/EnterAttributeAddChosenSubtypeEffect.java index b70c8bb1815..1d0395590e8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/enterAttribute/EnterAttributeAddChosenSubtypeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/enterAttribute/EnterAttributeAddChosenSubtypeEffect.java @@ -1,7 +1,6 @@ package mage.abilities.effects.common.enterAttribute; -import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantHaveCountersSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantHaveCountersSourceEffect.java index 851e92d6d19..6e73cc89974 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantHaveCountersSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantHaveCountersSourceEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.ruleModifying; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java index 89e30deba4d..5b1a31524b6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java @@ -3,6 +3,7 @@ package mage.abilities.effects.common.ruleModifying; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/TargetsHaveToTargetPermanentIfAbleEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/TargetsHaveToTargetPermanentIfAbleEffect.java index e02f7003b7c..adf27b15012 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/TargetsHaveToTargetPermanentIfAbleEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/TargetsHaveToTargetPermanentIfAbleEffect.java @@ -5,6 +5,9 @@ */ package mage.abilities.effects.common.ruleModifying; +import java.util.List; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -21,9 +24,6 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.Target; -import java.util.List; -import java.util.UUID; - /** * 6/8/2016 If a spell or ability's targets are changed, or if a copy of a spell * or ability is put onto the stack and has new targets chosen, it doesn't have diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessCMCPutIntoPlay.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessCMCPutIntoPlay.java index 09754429ba9..4744810b39d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessCMCPutIntoPlay.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardWithLessCMCPutIntoPlay.java @@ -2,10 +2,10 @@ package mage.abilities.effects.common.search; import mage.MageObject; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardsImpl; +import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java index 788c3e37544..f9497454358 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.search; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java index 86bd7d7337f..0785f0a064f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.search; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java index 1352d886ae2..9568123e16c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.common.search; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.CardsImpl; @@ -10,9 +13,6 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.util.CardUtil; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java index 021f763d2f0..71aa400c842 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java @@ -7,6 +7,7 @@ package mage.abilities.effects.common.search; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.CardsImpl; diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java index c116004e5e4..5ba8b9b1dc7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java @@ -2,9 +2,9 @@ package mage.abilities.effects.common.search; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; +import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java index 2a4f1f90cca..e965bb4ac76 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.search; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/turn/AddExtraTurnControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/turn/AddExtraTurnControllerEffect.java index de6e8df8250..1d6bb9f97ed 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/turn/AddExtraTurnControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/turn/AddExtraTurnControllerEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.turn; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java b/Mage/src/main/java/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java index b308dcbca4f..950416a351b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.common.turn; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/effects/common/turn/SkipNextTurnSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/turn/SkipNextTurnSourceEffect.java index 9a37af2e79e..c953ed81454 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/turn/SkipNextTurnSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/turn/SkipNextTurnSourceEffect.java @@ -6,6 +6,7 @@ package mage.abilities.effects.common.turn; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java index f443ca65bcf..7603fded89e 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.keyword; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; @@ -18,8 +20,6 @@ import mage.target.Target; import mage.target.TargetPermanent; import mage.util.CardUtil; -import java.util.UUID; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java index 15978c837b3..84fd5c7bbc2 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java @@ -1,5 +1,7 @@ package mage.abilities.effects.keyword; +import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.Cost; @@ -13,8 +15,6 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.Locale; - public class EchoEffect extends OneShotEffect { protected Cost cost; diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java index b31964fc2aa..7670c366c19 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java @@ -1,6 +1,7 @@ package mage.abilities.effects.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestEffect.java index 9b3f932c948..e01004e7f11 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.keyword; import java.util.Set; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCosts; diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java index 91899deb1f2..3d8f2a4538b 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java @@ -2,6 +2,7 @@ package mage.abilities.effects.keyword; import java.util.Set; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCosts; diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java index 0f644f6b6fd..96e74ab1acb 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java @@ -1,5 +1,10 @@ package mage.abilities.effects.mana; +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; + import mage.ConditionalMana; import mage.Mana; import mage.abilities.Ability; @@ -11,10 +16,6 @@ import mage.choices.ChoiceColor; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import org.apache.log4j.Logger; - -import java.util.ArrayList; -import java.util.List; /** * @author noxx diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfTwoDifferentColorsEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfTwoDifferentColorsEffect.java index a2627e11357..563448f7091 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfTwoDifferentColorsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfTwoDifferentColorsEffect.java @@ -7,6 +7,7 @@ package mage.abilities.effects.mana; import java.util.ArrayList; import java.util.List; + import mage.ConditionalMana; import mage.Mana; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java index 1ad18e17887..596141ed277 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.common.ManaEffect; @@ -8,9 +11,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java index 17e49384e38..23c73dc0eec 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java @@ -1,5 +1,9 @@ package mage.abilities.effects.mana; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -10,10 +14,6 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyColorEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyColorEffect.java index ccb47b68a54..3efa3e24e9b 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyColorEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyColorEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.choices.ChoiceColor; @@ -7,9 +10,6 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import java.util.ArrayList; -import java.util.List; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java index db06a36b7d9..92d1eee568a 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java @@ -1,5 +1,8 @@ package mage.abilities.effects.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.common.ManaEffect; @@ -9,9 +12,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfTwoDifferentColorsEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfTwoDifferentColorsEffect.java index 0f91a11a9f5..08578d891f8 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfTwoDifferentColorsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfTwoDifferentColorsEffect.java @@ -1,6 +1,9 @@ package mage.abilities.effects.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.common.ManaEffect; @@ -8,9 +11,6 @@ import mage.choices.ManaChoice; import mage.game.Game; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; - public class AddManaOfTwoDifferentColorsEffect extends ManaEffect { public AddManaOfTwoDifferentColorsEffect() { diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java index 4a842cf0d9c..af54fc6f802 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java @@ -5,15 +5,15 @@ */ package mage.abilities.effects.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.common.ManaEffect; import mage.game.Game; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/mana/BasicManaEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/BasicManaEffect.java index c3c0e99633a..60314cecc11 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/BasicManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/BasicManaEffect.java @@ -5,7 +5,6 @@ import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.common.ManaEffect; import mage.game.Game; -import mage.players.Player; public class BasicManaEffect extends ManaEffect { diff --git a/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java index 2b3aad2f218..a8a767af8c8 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java @@ -5,6 +5,9 @@ */ package mage.abilities.effects.mana; +import java.util.List; +import java.util.UUID; + import mage.MageObject; import mage.Mana; import mage.abilities.Ability; @@ -16,10 +19,6 @@ import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/mana/DynamicManaEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/DynamicManaEffect.java index 27f17b7d399..e4611eaee8e 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/DynamicManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/DynamicManaEffect.java @@ -1,6 +1,9 @@ package mage.abilities.effects.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.Mode; @@ -11,9 +14,6 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; - /** * * @author North diff --git a/Mage/src/main/java/mage/abilities/hint/ConditionHint.java b/Mage/src/main/java/mage/abilities/hint/ConditionHint.java index 4df8b1cf593..bc88b9dae4d 100644 --- a/Mage/src/main/java/mage/abilities/hint/ConditionHint.java +++ b/Mage/src/main/java/mage/abilities/hint/ConditionHint.java @@ -1,11 +1,11 @@ package mage.abilities.hint; +import java.awt.Color; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; -import java.awt.*; - /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/abilities/hint/Hint.java b/Mage/src/main/java/mage/abilities/hint/Hint.java index 12092140054..b0ceb452504 100644 --- a/Mage/src/main/java/mage/abilities/hint/Hint.java +++ b/Mage/src/main/java/mage/abilities/hint/Hint.java @@ -1,10 +1,10 @@ package mage.abilities.hint; +import java.io.Serializable; + import mage.abilities.Ability; import mage.game.Game; -import java.io.Serializable; - /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/abilities/hint/HintUtils.java b/Mage/src/main/java/mage/abilities/hint/HintUtils.java index cd36e35cfaf..c185eca5214 100644 --- a/Mage/src/main/java/mage/abilities/hint/HintUtils.java +++ b/Mage/src/main/java/mage/abilities/hint/HintUtils.java @@ -1,6 +1,6 @@ package mage.abilities.hint; -import java.awt.*; +import java.awt.Color; import java.util.HashSet; import java.util.List; diff --git a/Mage/src/main/java/mage/abilities/hint/StaticHint.java b/Mage/src/main/java/mage/abilities/hint/StaticHint.java index 848b09ac568..36e69ce6f4f 100644 --- a/Mage/src/main/java/mage/abilities/hint/StaticHint.java +++ b/Mage/src/main/java/mage/abilities/hint/StaticHint.java @@ -1,10 +1,10 @@ package mage.abilities.hint; +import java.awt.Color; + import mage.abilities.Ability; import mage.game.Game; -import java.awt.*; - /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java b/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java index 2e8feb1ceef..1340dccc1c5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/keyword/AftermathAbility.java b/Mage/src/main/java/mage/abilities/keyword/AftermathAbility.java index bb9c97f3ccd..fffb613b69e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AftermathAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AftermathAbility.java @@ -1,12 +1,18 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.*; +import mage.abilities.effects.AsThoughEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; +import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; import mage.cards.SplitCardHalf; -import mage.constants.*; +import mage.constants.AsThoughEffectType; +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.ZoneChangeEvent; diff --git a/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java b/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java index 313088817b6..06dfa8a3e91 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java @@ -1,6 +1,9 @@ package mage.abilities.keyword; +import java.util.Objects; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; @@ -15,9 +18,6 @@ import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.util.CardUtil; -import java.util.Objects; -import java.util.UUID; - /** * 702.84. Annihilator 702.84a Annihilator is a triggered ability. "Annihilator * N" means "Whenever this creature attacks, defending player sacrifices N diff --git a/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java b/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java index 2292030e096..3900c366a03 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java @@ -1,10 +1,11 @@ package mage.abilities.keyword; +import static mage.abilities.keyword.AscendAbility.ASCEND_RULE; + import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; -import static mage.abilities.keyword.AscendAbility.ASCEND_RULE; import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; diff --git a/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java b/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java index 7da5d3a4476..4e5e85dcb7f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java @@ -8,7 +8,11 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.mana.AlternateManaPaymentAbility; import mage.abilities.costs.mana.ManaCost; import mage.abilities.effects.OneShotEffect; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.ManaType; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.FilterPlayer; import mage.game.Game; import mage.players.ManaPool; diff --git a/Mage/src/main/java/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java b/Mage/src/main/java/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java index f35064d7c23..f2d992dfeba 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * This is marker ability that is used only for rule display. diff --git a/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java b/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java index 381f7c42a23..6e7e04ad0ec 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java @@ -1,5 +1,9 @@ package mage.abilities.keyword; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -11,7 +15,12 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.Card; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.SpellAbilityType; +import mage.constants.SubType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; @@ -20,9 +29,6 @@ import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; -import org.apache.log4j.Logger; - -import java.util.UUID; /** * @author LevelX2 diff --git a/Mage/src/main/java/mage/abilities/keyword/BandingAbility.java b/Mage/src/main/java/mage/abilities/keyword/BandingAbility.java index 79b574f3c77..25f6555fec5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BandingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BandingAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java b/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java index 517cb2413d4..0f75fc1a0c5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java @@ -2,9 +2,9 @@ package mage.abilities.keyword; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java b/Mage/src/main/java/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java index 1a6f8fce786..b7eb1815300 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * This is marker ability that is used only for rule display. diff --git a/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java b/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java index 1ab6b82d4c9..a5f1625f44e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.target.common.TargetAttackingCreature; /** diff --git a/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java b/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java index 885301b7a59..bb9d0525a53 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java b/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java index 28817daaf58..7929d6a8efe 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java @@ -1,9 +1,15 @@ package mage.abilities.keyword; +import java.util.Iterator; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; -import mage.abilities.costs.*; +import mage.abilities.costs.Cost; +import mage.abilities.costs.Costs; +import mage.abilities.costs.OptionalAdditionalCost; +import mage.abilities.costs.OptionalAdditionalCostImpl; +import mage.abilities.costs.OptionalAdditionalSourceCosts; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ReplacementEffectImpl; @@ -16,8 +22,6 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.players.Player; -import java.util.Iterator; - /** * 702.25. Buyback *

diff --git a/Mage/src/main/java/mage/abilities/keyword/CanBlockSpaceflightAbility.java b/Mage/src/main/java/mage/abilities/keyword/CanBlockSpaceflightAbility.java index 68138e2f0fd..3dda5dd021f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CanBlockSpaceflightAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CanBlockSpaceflightAbility.java @@ -6,6 +6,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/CantBlockAloneAbility.java b/Mage/src/main/java/mage/abilities/keyword/CantBlockAloneAbility.java index 62e64e4948d..2079ecfadc1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CantBlockAloneAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CantBlockAloneAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * @author magenoxx_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java index 25b84714872..47cc9ac2984 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java @@ -4,6 +4,7 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.EnumSet; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.StaticAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/ChangelingAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChangelingAbility.java index 7a0ef7dbb1d..4d27d5cb357 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ChangelingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ChangelingAbility.java @@ -2,12 +2,12 @@ package mage.abilities.keyword; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; -import java.io.ObjectStreamException; - /** * October 1, 2012 diff --git a/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java index cb32349f5b8..26837f623d0 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java @@ -2,12 +2,12 @@ package mage.abilities.keyword; -import mage.constants.Zone; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.constants.TimingRule; +import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java index 211fee26027..d38a17dd426 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java @@ -1,5 +1,10 @@ package mage.abilities.keyword; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; @@ -26,11 +31,6 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.common.TargetControlledPermanent; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import java.util.UUID; - /* * 702.77. Conspire * 702.77a Conspire is a keyword that represents two abilities. diff --git a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java index 19a50c3e328..7cc9290f29f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.UUID; + import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java index 8f91103ef51..f70c814b71a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java @@ -1,6 +1,10 @@ package mage.abilities.keyword; +import java.awt.Color; +import java.util.Objects; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -20,10 +24,6 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; -import java.awt.*; -import java.util.Objects; -import java.util.UUID; - /** * @author emerald000 */ diff --git a/Mage/src/main/java/mage/abilities/keyword/DashAbility.java b/Mage/src/main/java/mage/abilities/keyword/DashAbility.java index 4e6bfc14a4d..2526680deb9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DashAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DashAbility.java @@ -4,6 +4,7 @@ package mage.abilities.keyword; import java.util.Iterator; import java.util.LinkedList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.SpellAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/DeathtouchAbility.java b/Mage/src/main/java/mage/abilities/keyword/DeathtouchAbility.java index bbca80fd97d..7ec279ca92d 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DeathtouchAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DeathtouchAbility.java @@ -1,11 +1,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java b/Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java index 57905a581db..8943812ac77 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java index 2855262cdb0..92e8813665a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.util.List; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.SpecialAction; @@ -22,8 +24,6 @@ import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; import mage.util.CardUtil; -import java.util.List; - /** * 702.65. Delve 702.65a Delve is a static ability that functions while the * spell with delve is on the stack. “Delve” means “For each generic mana in diff --git a/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java b/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java index 7275c54a948..1de72ebcd2f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java b/Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java index b87d3a45678..7c575d4c92a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java b/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java index afdda45c0de..91eecd98014 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java @@ -1,6 +1,8 @@ package mage.abilities.keyword; +import java.util.UUID; + import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; @@ -12,8 +14,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import java.util.UUID; - /** * * @author Backfir3 diff --git a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java index c11ec9da556..7e36ec36530 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.util.UUID; + import mage.Mana; import mage.abilities.SpellAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -19,8 +21,6 @@ import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.util.CardUtil; -import java.util.UUID; - /** * @author emerald000 */ diff --git a/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java b/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java index 4c3bbec3e27..44d78328209 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java @@ -1,8 +1,8 @@ package mage.abilities.keyword; -import mage.constants.Zone; import mage.abilities.StaticAbility; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java b/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java index 6b4b95043ef..078159fcb34 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java @@ -1,18 +1,22 @@ package mage.abilities.keyword; +import java.util.Iterator; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; -import mage.abilities.costs.*; +import mage.abilities.costs.Cost; +import mage.abilities.costs.Costs; +import mage.abilities.costs.OptionalAdditionalCost; +import mage.abilities.costs.OptionalAdditionalCostImpl; +import mage.abilities.costs.OptionalAdditionalModeSourceCosts; import mage.abilities.costs.mana.ManaCostsImpl; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; -import java.util.Iterator; - /** * 702.40. Entwine *

diff --git a/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java index 69ece42509d..4a05973d8b7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.util.UUID; + import mage.abilities.SpellAbility; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -12,8 +14,6 @@ import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; import mage.util.CardUtil; -import java.util.UUID; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java index ab0f8004b1e..aa004ac4aaa 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java @@ -4,6 +4,7 @@ package mage.abilities.keyword; import java.util.Iterator; import java.util.LinkedList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java index 61258ee24ac..5d38d780dc9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java @@ -3,6 +3,7 @@ package mage.abilities.keyword; import java.util.HashSet; import java.util.Set; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.Mode; diff --git a/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java index 9d0fe3f7d99..41f4227b644 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java @@ -4,13 +4,13 @@ package mage.abilities.keyword; import java.util.UUID; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/keyword/FearAbility.java b/Mage/src/main/java/mage/abilities/keyword/FearAbility.java index e380accd372..014679ff08d 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FearAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FearAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.io.ObjectStreamException; + import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -8,8 +10,6 @@ import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; -import java.io.ObjectStreamException; - /** * @author Loki */ diff --git a/Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java b/Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java index 3c467bb9dc6..7dd4e3176ce 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/FlashAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlashAbility.java index 10168348ddd..eb47838cc9c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlashAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlashAbility.java @@ -3,6 +3,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java index 145257ae4b1..3ece9f739f7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java index 3550730f0b8..9a135bb52a3 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.io.ObjectStreamException; + import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -10,8 +12,6 @@ import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.io.ObjectStreamException; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java index 5e411a5c370..7ac9a1542c9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.RevealSourceFromYourHandCost; diff --git a/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java b/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java index 748c53cf811..7a479c316da 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java @@ -2,23 +2,16 @@ package mage.abilities.keyword; +import mage.abilities.ActivatedAbilityImpl; +import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.FortifyEffect; import mage.constants.Outcome; -import mage.constants.SubType; import mage.constants.TimingRule; import mage.constants.Zone; -import mage.abilities.ActivatedAbilityImpl; -import mage.abilities.costs.Cost; -import mage.abilities.effects.common.AttachEffect; import mage.filter.common.FilterControlledLandPermanent; -import mage.game.Game; -import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.TargetPermanent; -import mage.target.common.TargetControlledCreaturePermanent; - -import java.util.UUID; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java b/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java index eed6bc6800c..0635ec50050 100644 --- a/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.Locale; + import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.TriggeredAbilityImpl; diff --git a/Mage/src/main/java/mage/abilities/keyword/HasteAbility.java b/Mage/src/main/java/mage/abilities/keyword/HasteAbility.java index cd8efee4d13..ee92f883b3a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HasteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HasteAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java b/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java index a13febfc0ec..0313ace3e51 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java @@ -1,6 +1,8 @@ package mage.abilities.keyword; +import java.util.UUID; + import mage.abilities.Mode; import mage.abilities.SpellAbility; import mage.abilities.TriggeredAbilityImpl; @@ -11,8 +13,6 @@ import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.target.Target; -import java.util.UUID; - /** * Heroic * diff --git a/Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java b/Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java index 1395823500a..3be03c47945 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.common.SimpleStaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlackAbility.java b/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlackAbility.java index 39ed14932ea..6983ba24bb9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlackAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.common.SimpleStaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlueAbility.java b/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlueAbility.java index 4f65271fa07..ef1fa7dffb8 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlueAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlueAbility.java @@ -1,11 +1,11 @@ package mage.abilities.keyword; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.common.SimpleStaticAbility; import mage.constants.Zone; -import java.io.ObjectStreamException; - /** * Hexproof from blue (This creature or player can't be the target of black * spells or abilities your opponents control.) diff --git a/Mage/src/main/java/mage/abilities/keyword/HexproofFromMonocoloredAbility.java b/Mage/src/main/java/mage/abilities/keyword/HexproofFromMonocoloredAbility.java index 88fd558921d..d1a71532706 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HexproofFromMonocoloredAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HexproofFromMonocoloredAbility.java @@ -1,11 +1,11 @@ package mage.abilities.keyword; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.common.SimpleStaticAbility; import mage.constants.Zone; -import java.io.ObjectStreamException; - /** * Hexproof from Monocolored (This creature or player can't be the target of monocolored * spells or abilities your opponents control.) diff --git a/Mage/src/main/java/mage/abilities/keyword/HexproofFromWhiteAbility.java b/Mage/src/main/java/mage/abilities/keyword/HexproofFromWhiteAbility.java index fb535e1c50c..1c372c2d2ac 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HexproofFromWhiteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HexproofFromWhiteAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.common.SimpleStaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java index 12ea093ed09..7dc2c4ade0b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java b/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java index 73b2ce7a35d..9d0e912aec7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.io.ObjectStreamException; + import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -8,8 +10,6 @@ import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; -import java.io.ObjectStreamException; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java b/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java index 74181458175..28f3493f052 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java @@ -6,6 +6,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.SpecialAction; diff --git a/Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java b/Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java index 0200258fd19..a34d4e56862 100644 --- a/Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java @@ -2,8 +2,9 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; -import mage.constants.Zone; + import mage.abilities.StaticAbility; +import mage.constants.Zone; /** * OLD RULES: 700.4. If a permanent is indestructible, rules and effects can't diff --git a/Mage/src/main/java/mage/abilities/keyword/InfectAbility.java b/Mage/src/main/java/mage/abilities/keyword/InfectAbility.java index dd003f9e18a..7f8fe538e6f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/InfectAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/InfectAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * 702.87. Infect diff --git a/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java b/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java index 3d944ba133a..95d987a353f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java @@ -1,9 +1,20 @@ package mage.abilities.keyword; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; -import mage.abilities.costs.*; +import mage.abilities.costs.Cost; +import mage.abilities.costs.Costs; +import mage.abilities.costs.CostsImpl; +import mage.abilities.costs.OptionalAdditionalCost; +import mage.abilities.costs.OptionalAdditionalCostImpl; +import mage.abilities.costs.OptionalAdditionalSourceCosts; import mage.abilities.costs.mana.ManaCostsImpl; import mage.constants.AbilityType; import mage.constants.Outcome; @@ -12,12 +23,6 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - /** * 20121001 702.31. Kicker 702.31a Kicker is a static ability that functions * while the spell with kicker is on the stack. "Kicker [cost]" means "You may diff --git a/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java b/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java index 7158bd8ce37..67a3f9a4401 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java +++ b/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java @@ -3,6 +3,7 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.List; + import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java b/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java index d2b31e2071f..231f7c4b8a1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.OpeningHandAction; import mage.abilities.StaticAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/LifelinkAbility.java b/Mage/src/main/java/mage/abilities/keyword/LifelinkAbility.java index 388ad91711b..0e17d67b26e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LifelinkAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/LifelinkAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java index 719ad2266ac..5a3442e048e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java b/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java index 2e4f406775f..383314ec0f6 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java @@ -1,7 +1,11 @@ package mage.abilities.keyword; -import java.util.*; +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.AttacksTriggeredAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java b/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java index 545062f5c7e..bf46eb35a59 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.common.DiesTriggeredAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java index e6482cc92e8..ae4ef9a121f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.Iterator; + import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java b/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java index ae1ad7f3d94..744fb0857f5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java @@ -4,12 +4,15 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.List; import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.CreateTokenCopyTargetEffect; +import mage.abilities.effects.common.ExileTargetEffect; import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.game.Game; @@ -17,7 +20,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTargets; -import org.apache.log4j.Logger; public class MyriadAbility extends AttacksTriggeredAbility { diff --git a/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java b/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java index 7c92b2f447f..05ff524adac 100644 --- a/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java b/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java index 9dbbdb3c030..0adf925a418 100644 --- a/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java @@ -1,6 +1,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -8,7 +9,12 @@ import mage.abilities.StaticAbility; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.Card; -import mage.constants.*; +import mage.constants.AsThoughEffectType; +import mage.constants.CostModificationType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.SubType; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/keyword/PartnerAbility.java b/Mage/src/main/java/mage/abilities/keyword/PartnerAbility.java index 936aa998e60..9a1866e07b1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PartnerAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PartnerAbility.java @@ -6,6 +6,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java b/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java index a9f9a82ec01..90766852c2b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java b/Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java index f509b2ac2bb..d99c9df6c39 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java @@ -3,6 +3,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java index 35da5cadedc..446ee618b92 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java @@ -3,6 +3,7 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.MageObject; import mage.ObjectColor; import mage.abilities.StaticAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java index 31b4f9ff56f..2fad9abec29 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.RequirementEffect; diff --git a/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java index 3e3ff1ca3c5..3125a26ffb1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java @@ -4,6 +4,7 @@ package mage.abilities.keyword; import java.util.Iterator; import java.util.LinkedList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/ReachAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReachAbility.java index ca8c01ac390..d64c769ceab 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ReachAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ReachAbility.java @@ -1,11 +1,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java index e64e119dd67..64e8ff68935 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -18,8 +20,6 @@ import mage.game.events.ZoneChangeEvent; import mage.game.stack.Spell; import mage.players.Player; -import java.util.UUID; - /** * This ability has no effect by default and will always return false on the * call to apply. This is because of how the {@link ReboundEffect} works. It diff --git a/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java b/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java index 9bde3078e55..9b283d4b029 100644 --- a/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java @@ -6,6 +6,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java index e4dd52dc791..049caed11b7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java @@ -1,10 +1,16 @@ package mage.abilities.keyword; +import java.util.Iterator; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.costs.*; +import mage.abilities.costs.Cost; +import mage.abilities.costs.Costs; +import mage.abilities.costs.OptionalAdditionalCost; +import mage.abilities.costs.OptionalAdditionalCostImpl; +import mage.abilities.costs.OptionalAdditionalSourceCosts; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -17,8 +23,6 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; -import java.util.Iterator; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java index a83256e7743..c3b4d4eaab8 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java @@ -2,9 +2,6 @@ package mage.abilities.keyword; -import mage.constants.Outcome; -import mage.constants.TimingRule; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.ExileSourceFromGraveCost; @@ -13,6 +10,9 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.Card; +import mage.constants.Outcome; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java b/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java index ed1689c4e1c..1050142cdd3 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.io.ObjectStreamException; + import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -9,8 +11,6 @@ import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; -import java.io.ObjectStreamException; - /** * "Shadow" keyword * diff --git a/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java b/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java index fb7f24fa88a..80c67818e71 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java index 0ccefbb9147..34835f319d2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java @@ -2,19 +2,19 @@ package mage.abilities.keyword; -import mage.constants.ComparisonType; +import java.util.UUID; + import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.ReturnToHandTargetEffect; +import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; -import java.util.UUID; - /** * * 702.45. Soulshift diff --git a/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java index ed9223756e6..d59b2c6229a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.io.ObjectStreamException; + import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -8,8 +10,6 @@ import mage.constants.Duration; import mage.game.Game; import mage.game.permanent.Permanent; -import java.io.ObjectStreamException; - /** * @author Styxo */ diff --git a/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java index 531f3b6304a..f8f5424b651 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java @@ -1,5 +1,8 @@ package mage.abilities.keyword; +import java.util.ArrayList; +import java.util.UUID; + import mage.abilities.SpellAbility; import mage.abilities.costs.mana.ManaCost; import mage.abilities.dynamicvalue.common.OpponentsLostLifeCount; @@ -9,9 +12,6 @@ import mage.constants.SpellAbilityType; import mage.constants.Zone; import mage.game.Game; -import java.util.ArrayList; -import java.util.UUID; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/abilities/keyword/SpliceOntoArcaneAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpliceOntoArcaneAbility.java index c6a604730cb..47b9966fd28 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpliceOntoArcaneAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpliceOntoArcaneAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.Iterator; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -12,7 +13,11 @@ import mage.abilities.costs.CostsImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.SpliceCardEffectImpl; import mage.cards.Card; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.SpellAbilityType; +import mage.constants.SubType; +import mage.constants.Zone; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/keyword/SpliceOntoInstantOrSorceryAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpliceOntoInstantOrSorceryAbility.java index 52136ebe7f7..41849ba54c2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpliceOntoInstantOrSorceryAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpliceOntoInstantOrSorceryAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.util.Iterator; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -18,8 +20,6 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; -import java.util.Iterator; - /** * 702.45. Splice *

diff --git a/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java index 55e5823ea5a..91d9bb899a9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import java.util.Optional; + import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -10,8 +12,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import java.util.Optional; - /** * Split Second * diff --git a/Mage/src/main/java/mage/abilities/keyword/SquirrellinkAbility.java b/Mage/src/main/java/mage/abilities/keyword/SquirrellinkAbility.java index 46481976455..373f0793d3f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SquirrellinkAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SquirrellinkAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/StormAbility.java b/Mage/src/main/java/mage/abilities/keyword/StormAbility.java index 001c1add9b3..a490144a3cc 100644 --- a/Mage/src/main/java/mage/abilities/keyword/StormAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/StormAbility.java @@ -1,5 +1,7 @@ package mage.abilities.keyword; +import org.apache.log4j.Logger; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -13,7 +15,6 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.watchers.common.CastSpellLastTurnWatcher; -import org.apache.log4j.Logger; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java index aa03cf95792..460495063e1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java @@ -3,6 +3,7 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.DynamicValue; diff --git a/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java b/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java index 4d3a17be182..5f6a3533c59 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java @@ -1,5 +1,8 @@ package mage.abilities.keyword; +import java.util.ArrayList; +import java.util.UUID; + import mage.abilities.SpellAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.cards.Card; @@ -9,9 +12,6 @@ import mage.game.Game; import mage.players.Player; import mage.watchers.common.CastSpellLastTurnWatcher; -import java.util.ArrayList; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java b/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java index 379d81027bc..49163814612 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java @@ -3,6 +3,7 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; @@ -19,7 +20,13 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.cards.Card; -import mage.constants.*; +import mage.constants.AsThoughEffectType; +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.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java b/Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java index a4b14d88a5b..9f83effa3be 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java index fb90104d2d1..47b4f03df43 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java @@ -5,7 +5,14 @@ import mage.abilities.Mode; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java index 7a4c9770b2b..d335ef472a7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java @@ -2,13 +2,13 @@ package mage.abilities.keyword; import mage.MageObject; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.TimingRule; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java index 9af00077c3a..86762259b31 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java @@ -2,6 +2,7 @@ package mage.abilities.keyword; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java b/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java index f5d4e4e8eaa..c08dfffa096 100644 --- a/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java @@ -1,11 +1,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/WitherAbility.java b/Mage/src/main/java/mage/abilities/keyword/WitherAbility.java index 45ca4810635..7eee8ca7462 100644 --- a/Mage/src/main/java/mage/abilities/keyword/WitherAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/WitherAbility.java @@ -1,11 +1,11 @@ package mage.abilities.keyword; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * 702.77. Wither diff --git a/Mage/src/main/java/mage/abilities/keyword/special/JohanVigilanceAbility.java b/Mage/src/main/java/mage/abilities/keyword/special/JohanVigilanceAbility.java index 5ed22bd1c58..62f821665b4 100644 --- a/Mage/src/main/java/mage/abilities/keyword/special/JohanVigilanceAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/special/JohanVigilanceAbility.java @@ -2,11 +2,11 @@ package mage.abilities.keyword.special; -import mage.constants.Zone; +import java.io.ObjectStreamException; + import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; - -import java.io.ObjectStreamException; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java b/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java index 51851391652..c6acdbd9b4a 100644 --- a/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java @@ -3,6 +3,7 @@ package mage.abilities.mana; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.Mana; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java index 9b352563898..e659d29b791 100644 --- a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java @@ -1,5 +1,8 @@ package mage.abilities.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -16,9 +19,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java index 84ac4f9a8bc..d32ea77f5b5 100644 --- a/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java @@ -5,6 +5,9 @@ */ package mage.abilities.mana; +import java.util.ArrayList; +import java.util.List; + import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -20,9 +23,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; - /** * @author CountAndromalius */ diff --git a/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java b/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java index 7392ba4fadd..d4064ac1f93 100644 --- a/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java @@ -2,9 +2,9 @@ package mage.abilities.mana; -import mage.constants.Zone; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.ManaEffect; +import mage.constants.Zone; /** * diff --git a/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java b/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java index 17c75f4b05d..d19217ff939 100644 --- a/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java @@ -1,5 +1,9 @@ package mage.abilities.mana; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -14,10 +18,6 @@ import mage.filter.FilterMana; import mage.game.Game; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/mana/ConditionalAnyColorManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ConditionalAnyColorManaAbility.java index c8d9cf3ac48..18ff0c7d9dc 100644 --- a/Mage/src/main/java/mage/abilities/mana/ConditionalAnyColorManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/ConditionalAnyColorManaAbility.java @@ -2,6 +2,7 @@ package mage.abilities.mana; import java.util.List; + import mage.Mana; import mage.abilities.costs.Cost; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java index c2d0a97511f..15a44889f23 100644 --- a/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java @@ -2,6 +2,7 @@ package mage.abilities.mana; import java.util.ArrayList; import java.util.List; + import mage.Mana; import mage.abilities.costs.Cost; import mage.abilities.decorator.ConditionalManaEffect; diff --git a/Mage/src/main/java/mage/abilities/mana/DelayedTriggeredManaAbility.java b/Mage/src/main/java/mage/abilities/mana/DelayedTriggeredManaAbility.java index a6b77494d44..024aec8744e 100644 --- a/Mage/src/main/java/mage/abilities/mana/DelayedTriggeredManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/DelayedTriggeredManaAbility.java @@ -2,11 +2,11 @@ package mage.abilities.mana; -import mage.constants.Zone; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ManaEffect; import mage.constants.Duration; +import mage.constants.Zone; /** * @author Plopman diff --git a/Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java b/Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java index 087a1d23c68..e93f331ef79 100644 --- a/Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java @@ -3,6 +3,7 @@ package mage.abilities.mana; import java.util.ArrayList; import java.util.List; + import mage.Mana; import mage.abilities.costs.Cost; import mage.abilities.costs.common.TapSourceCost; diff --git a/Mage/src/main/java/mage/abilities/mana/ManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ManaAbility.java index d4d0de12fff..2bea2f14b49 100644 --- a/Mage/src/main/java/mage/abilities/mana/ManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/ManaAbility.java @@ -6,6 +6,7 @@ package mage.abilities.mana; import java.util.List; + import mage.Mana; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/mana/ManaOptions.java b/Mage/src/main/java/mage/abilities/mana/ManaOptions.java index bfd32e47478..422436f9062 100644 --- a/Mage/src/main/java/mage/abilities/mana/ManaOptions.java +++ b/Mage/src/main/java/mage/abilities/mana/ManaOptions.java @@ -4,6 +4,9 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; + +import org.apache.log4j.Logger; + import mage.Mana; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -11,7 +14,6 @@ import mage.abilities.costs.common.TapSourceCost; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ManaEvent; -import org.apache.log4j.Logger; /** * diff --git a/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java b/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java index 0877a667c25..24a84ae1270 100644 --- a/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java @@ -2,6 +2,7 @@ package mage.abilities.mana; import java.util.ArrayList; import java.util.List; + import mage.Mana; import mage.abilities.costs.Cost; import mage.abilities.effects.common.ManaEffect; diff --git a/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java b/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java index 41173683bd1..846382bc179 100644 --- a/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java @@ -2,6 +2,7 @@ package mage.abilities.mana; import java.util.ArrayList; import java.util.List; + import mage.Mana; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage/src/main/java/mage/abilities/mana/builder/common/InstantOrSorcerySpellManaBuilder.java b/Mage/src/main/java/mage/abilities/mana/builder/common/InstantOrSorcerySpellManaBuilder.java index 62b2fbf0035..f4300ed9015 100644 --- a/Mage/src/main/java/mage/abilities/mana/builder/common/InstantOrSorcerySpellManaBuilder.java +++ b/Mage/src/main/java/mage/abilities/mana/builder/common/InstantOrSorcerySpellManaBuilder.java @@ -1,5 +1,7 @@ package mage.abilities.mana.builder.common; +import java.util.UUID; + import mage.ConditionalMana; import mage.MageObject; import mage.Mana; @@ -11,8 +13,6 @@ import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.abilities.mana.conditional.ManaCondition; import mage.game.Game; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/mana/builder/common/SimpleActivatedAbilityManaBuilder.java b/Mage/src/main/java/mage/abilities/mana/builder/common/SimpleActivatedAbilityManaBuilder.java index 86e7b3bbe48..68c64957ea1 100644 --- a/Mage/src/main/java/mage/abilities/mana/builder/common/SimpleActivatedAbilityManaBuilder.java +++ b/Mage/src/main/java/mage/abilities/mana/builder/common/SimpleActivatedAbilityManaBuilder.java @@ -1,5 +1,7 @@ package mage.abilities.mana.builder.common; +import java.util.UUID; + import mage.ConditionalMana; import mage.Mana; import mage.abilities.Ability; @@ -10,8 +12,6 @@ import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.abilities.mana.conditional.ManaCondition; import mage.game.Game; -import java.util.UUID; - /** * testing class * diff --git a/Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastManaCondition.java b/Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastManaCondition.java index c13f3033d08..03a21696973 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastManaCondition.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastManaCondition.java @@ -2,6 +2,7 @@ package mage.abilities.mana.conditional; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; diff --git a/Mage/src/main/java/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java b/Mage/src/main/java/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java index 86f5939b30c..95a7b5d7317 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java @@ -6,6 +6,7 @@ package mage.abilities.mana.conditional; import java.util.UUID; + import mage.ConditionalMana; import mage.MageObject; import mage.Mana; diff --git a/Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastManaCondition.java b/Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastManaCondition.java index a6a822bd9de..bb9e36eabbf 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastManaCondition.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastManaCondition.java @@ -2,6 +2,7 @@ package mage.abilities.mana.conditional; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; diff --git a/Mage/src/main/java/mage/abilities/mana/conditional/ManaCondition.java b/Mage/src/main/java/mage/abilities/mana/conditional/ManaCondition.java index 86823bf289c..9ce703fb9c5 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/ManaCondition.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/ManaCondition.java @@ -2,6 +2,7 @@ package mage.abilities.mana.conditional; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; diff --git a/Mage/src/main/java/mage/abilities/mana/conditional/PlaneswalkerCastManaCondition.java b/Mage/src/main/java/mage/abilities/mana/conditional/PlaneswalkerCastManaCondition.java index 25509560e50..b27475bffa1 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/PlaneswalkerCastManaCondition.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/PlaneswalkerCastManaCondition.java @@ -1,6 +1,8 @@ package mage.abilities.mana.conditional; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -8,8 +10,6 @@ import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; import mage.game.Game; -import java.util.UUID; - /** * @author jgray1206 */ diff --git a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java index 0a4a17cb4c2..569f90955d1 100644 --- a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java @@ -3,6 +3,7 @@ package mage.abilities.meta; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; diff --git a/Mage/src/main/java/mage/abilities/text/TextPart.java b/Mage/src/main/java/mage/abilities/text/TextPart.java index 87431fd1d64..cac250fa47a 100644 --- a/Mage/src/main/java/mage/abilities/text/TextPart.java +++ b/Mage/src/main/java/mage/abilities/text/TextPart.java @@ -3,6 +3,7 @@ package mage.abilities.text; import java.io.Serializable; import java.util.UUID; + import mage.util.Copyable; /** diff --git a/Mage/src/main/java/mage/actions/MageDrawAction.java b/Mage/src/main/java/mage/actions/MageDrawAction.java index dba094ec986..7efacc73797 100644 --- a/Mage/src/main/java/mage/actions/MageDrawAction.java +++ b/Mage/src/main/java/mage/actions/MageDrawAction.java @@ -3,6 +3,7 @@ package mage.actions; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.actions.impl.MageAction; import mage.actions.score.ArtificialScoringSystem; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/actions/score/ArtificialScoringSystem.java b/Mage/src/main/java/mage/actions/score/ArtificialScoringSystem.java index ebd9a6de56f..a20eb1d69b7 100644 --- a/Mage/src/main/java/mage/actions/score/ArtificialScoringSystem.java +++ b/Mage/src/main/java/mage/actions/score/ArtificialScoringSystem.java @@ -1,8 +1,9 @@ package mage.actions.score; +import org.apache.log4j.Logger; + import mage.cards.Card; import mage.game.Game; -import org.apache.log4j.Logger; /** * @author ayratn diff --git a/Mage/src/main/java/mage/cards/AdventureCard.java b/Mage/src/main/java/mage/cards/AdventureCard.java index 1cb62d410ac..e510d5aa6d4 100644 --- a/Mage/src/main/java/mage/cards/AdventureCard.java +++ b/Mage/src/main/java/mage/cards/AdventureCard.java @@ -2,6 +2,7 @@ package mage.cards; import java.util.List; import java.util.UUID; + import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java b/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java index 82c157401c9..d8029968966 100644 --- a/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java +++ b/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java @@ -5,6 +5,11 @@ */ package mage.cards; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.abilities.Modes; import mage.abilities.SpellAbility; import mage.abilities.effects.common.ExileAdventureSpellEffect; @@ -15,11 +20,6 @@ import mage.constants.Zone; import mage.game.ExileZone; import mage.game.Game; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; - /** * @author phulin */ diff --git a/Mage/src/main/java/mage/cards/Card.java b/Mage/src/main/java/mage/cards/Card.java index 81a6877abbb..6bec200f986 100644 --- a/Mage/src/main/java/mage/cards/Card.java +++ b/Mage/src/main/java/mage/cards/Card.java @@ -2,6 +2,7 @@ package mage.cards; import java.util.List; import java.util.UUID; + import mage.MageObject; import mage.Mana; import mage.abilities.Abilities; diff --git a/Mage/src/main/java/mage/cards/CardGraphicInfo.java b/Mage/src/main/java/mage/cards/CardGraphicInfo.java index d0c4ae06410..11352ae5403 100644 --- a/Mage/src/main/java/mage/cards/CardGraphicInfo.java +++ b/Mage/src/main/java/mage/cards/CardGraphicInfo.java @@ -1,9 +1,9 @@ package mage.cards; -import mage.ObjectColor; - import java.io.Serializable; +import mage.ObjectColor; + public final class CardGraphicInfo implements Serializable { private final ObjectColor frameColor; diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index 8ebe60c3d79..2b7209fc03f 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -1,26 +1,45 @@ package mage.cards; -import com.google.common.collect.ImmutableList; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.UUID; + +import org.apache.log4j.Logger; + +import com.google.common.collect.ImmutableList; + import mage.MageObject; import mage.MageObjectImpl; import mage.Mana; import mage.ObjectColor; -import mage.abilities.*; +import mage.abilities.Abilities; +import mage.abilities.AbilitiesImpl; +import mage.abilities.Ability; +import mage.abilities.PlayLandAbility; +import mage.abilities.SpellAbility; import mage.abilities.hint.Hint; import mage.abilities.hint.HintUtils; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.repository.PluginClassloaderRegistery; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.EmptyNames; +import mage.constants.Rarity; +import mage.constants.SpellAbilityType; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.counters.Counter; import mage.counters.Counters; import mage.filter.FilterMana; -import mage.game.*; +import mage.game.CardAttribute; +import mage.game.CardState; +import mage.game.Game; +import mage.game.GameState; +import mage.game.ZoneChangeInfo; +import mage.game.ZonesHandler; import mage.game.command.CommandObject; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -30,7 +49,6 @@ import mage.game.stack.StackObject; import mage.util.GameLog; import mage.util.SubTypeList; import mage.watchers.Watcher; -import org.apache.log4j.Logger; public abstract class CardImpl extends MageObjectImpl implements Card { diff --git a/Mage/src/main/java/mage/cards/CardSetInfo.java b/Mage/src/main/java/mage/cards/CardSetInfo.java index 447175b38a2..9105e78860c 100644 --- a/Mage/src/main/java/mage/cards/CardSetInfo.java +++ b/Mage/src/main/java/mage/cards/CardSetInfo.java @@ -1,10 +1,10 @@ package mage.cards; +import java.io.Serializable; + import mage.constants.Rarity; import mage.util.Copyable; -import java.io.Serializable; - public final class CardSetInfo implements Serializable, Copyable { private final String name; diff --git a/Mage/src/main/java/mage/cards/Cards.java b/Mage/src/main/java/mage/cards/Cards.java index 4ffe0c228ff..2f94058c7d2 100644 --- a/Mage/src/main/java/mage/cards/Cards.java +++ b/Mage/src/main/java/mage/cards/Cards.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; import java.util.UUID; + import mage.filter.FilterCard; import mage.game.Game; diff --git a/Mage/src/main/java/mage/cards/CardsImpl.java b/Mage/src/main/java/mage/cards/CardsImpl.java index 250bb3f3b84..b9c0565ce09 100644 --- a/Mage/src/main/java/mage/cards/CardsImpl.java +++ b/Mage/src/main/java/mage/cards/CardsImpl.java @@ -1,15 +1,25 @@ package mage.cards; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.MageObject; import mage.filter.FilterCard; import mage.game.Game; import mage.util.RandomUtil; import mage.util.ThreadLocalStringBuilder; -import java.io.Serializable; -import java.util.*; -import java.util.stream.Collectors; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index f1879539936..0ff40eafa96 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -1,8 +1,18 @@ package mage.cards; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.EnumMap; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; + +import org.apache.log4j.Logger; + import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.keyword.PartnerWithAbility; @@ -13,7 +23,6 @@ import mage.constants.Rarity; import mage.constants.SetType; import mage.util.CardUtil; import mage.util.RandomUtil; -import org.apache.log4j.Logger; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/cards/LevelerCard.java b/Mage/src/main/java/mage/cards/LevelerCard.java index 2c3912f2f6c..f8d874d6400 100644 --- a/Mage/src/main/java/mage/cards/LevelerCard.java +++ b/Mage/src/main/java/mage/cards/LevelerCard.java @@ -3,6 +3,7 @@ package mage.cards; import java.util.UUID; + import mage.constants.CardType; /** diff --git a/Mage/src/main/java/mage/cards/MeldCard.java b/Mage/src/main/java/mage/cards/MeldCard.java index af29691a26e..d5616e2e3b5 100644 --- a/Mage/src/main/java/mage/cards/MeldCard.java +++ b/Mage/src/main/java/mage/cards/MeldCard.java @@ -1,6 +1,9 @@ package mage.cards; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.constants.CardType; import mage.constants.Zone; @@ -9,9 +12,6 @@ import mage.game.Game; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; -import java.util.List; -import java.util.UUID; - /** * * @author emerald000 diff --git a/Mage/src/main/java/mage/cards/Sets.java b/Mage/src/main/java/mage/cards/Sets.java index 1c3bde2f14f..e007d05e7a9 100644 --- a/Mage/src/main/java/mage/cards/Sets.java +++ b/Mage/src/main/java/mage/cards/Sets.java @@ -1,5 +1,14 @@ package mage.cards; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.log4j.Logger; +import org.junit.Assert; + import mage.Mana; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; @@ -10,10 +19,6 @@ import mage.constants.Rarity; import mage.filter.FilterMana; import mage.util.ClassScanner; import mage.util.RandomUtil; -import org.apache.log4j.Logger; -import org.junit.Assert; - -import java.util.*; /** * @author BetaSteward_at_googlemail.com, JayDi85 diff --git a/Mage/src/main/java/mage/cards/SplitCard.java b/Mage/src/main/java/mage/cards/SplitCard.java index 21c58c6c13c..a75ba798f01 100644 --- a/Mage/src/main/java/mage/cards/SplitCard.java +++ b/Mage/src/main/java/mage/cards/SplitCard.java @@ -3,6 +3,7 @@ package mage.cards; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; diff --git a/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java index 4649864452e..4afb473d47c 100644 --- a/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java +++ b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java @@ -5,14 +5,14 @@ */ package mage.cards; +import java.util.List; +import java.util.UUID; + import mage.constants.CardType; import mage.constants.SpellAbilityType; import mage.constants.Zone; import mage.game.Game; -import java.util.List; -import java.util.UUID; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java index 768c366f038..82c662a0118 100644 --- a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java +++ b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java @@ -3,10 +3,10 @@ package mage.cards.basiclands; import java.util.UUID; -import mage.cards.CardSetInfo; -import mage.constants.CardType; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; diff --git a/Mage/src/main/java/mage/cards/basiclands/Forest.java b/Mage/src/main/java/mage/cards/basiclands/Forest.java index 2092d60e98c..cec4c64cbc1 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Forest.java +++ b/Mage/src/main/java/mage/cards/basiclands/Forest.java @@ -3,6 +3,7 @@ package mage.cards.basiclands; import java.util.UUID; + import mage.ObjectColor; import mage.abilities.mana.GreenManaAbility; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/cards/basiclands/Island.java b/Mage/src/main/java/mage/cards/basiclands/Island.java index 063123bc022..284a584d133 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Island.java +++ b/Mage/src/main/java/mage/cards/basiclands/Island.java @@ -3,6 +3,7 @@ package mage.cards.basiclands; import java.util.UUID; + import mage.ObjectColor; import mage.abilities.mana.BlueManaAbility; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/cards/basiclands/Mountain.java b/Mage/src/main/java/mage/cards/basiclands/Mountain.java index 5db835d2324..82e25070476 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Mountain.java +++ b/Mage/src/main/java/mage/cards/basiclands/Mountain.java @@ -3,6 +3,7 @@ package mage.cards.basiclands; import java.util.UUID; + import mage.ObjectColor; import mage.abilities.mana.RedManaAbility; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/cards/basiclands/Plains.java b/Mage/src/main/java/mage/cards/basiclands/Plains.java index cef5b07cc4e..58f7b176956 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Plains.java +++ b/Mage/src/main/java/mage/cards/basiclands/Plains.java @@ -3,6 +3,7 @@ package mage.cards.basiclands; import java.util.UUID; + import mage.ObjectColor; import mage.abilities.mana.WhiteManaAbility; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/cards/basiclands/Swamp.java b/Mage/src/main/java/mage/cards/basiclands/Swamp.java index 9ea15701f87..cf7a1713a8c 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Swamp.java +++ b/Mage/src/main/java/mage/cards/basiclands/Swamp.java @@ -3,6 +3,7 @@ package mage.cards.basiclands; import java.util.UUID; + import mage.ObjectColor; import mage.abilities.mana.BlackManaAbility; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/cards/decks/Constructed.java b/Mage/src/main/java/mage/cards/decks/Constructed.java index 8718c635408..feb76c46ef1 100644 --- a/Mage/src/main/java/mage/cards/decks/Constructed.java +++ b/Mage/src/main/java/mage/cards/decks/Constructed.java @@ -1,13 +1,18 @@ package mage.cards.decks; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.log4j.Logger; + import mage.cards.Card; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.constants.Rarity; -import org.apache.log4j.Logger; - -import java.util.*; -import java.util.Map.Entry; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/cards/decks/Deck.java b/Mage/src/main/java/mage/cards/decks/Deck.java index 8ffb88bcc05..f1e1a3c40f6 100644 --- a/Mage/src/main/java/mage/cards/decks/Deck.java +++ b/Mage/src/main/java/mage/cards/decks/Deck.java @@ -7,12 +7,14 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; + +import org.apache.log4j.Logger; + import mage.cards.Card; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.game.GameException; import mage.util.DeckUtil; -import org.apache.log4j.Logger; public class Deck implements Serializable { diff --git a/Mage/src/main/java/mage/cards/decks/DeckFileFilter.java b/Mage/src/main/java/mage/cards/decks/DeckFileFilter.java index d7ca6415edd..a2823e6bca0 100644 --- a/Mage/src/main/java/mage/cards/decks/DeckFileFilter.java +++ b/Mage/src/main/java/mage/cards/decks/DeckFileFilter.java @@ -1,9 +1,10 @@ package mage.cards.decks; -import javax.swing.filechooser.FileFilter; import java.io.File; import java.util.Locale; +import javax.swing.filechooser.FileFilter; + /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/cards/decks/DeckFormats.java b/Mage/src/main/java/mage/cards/decks/DeckFormats.java index 1677fe79bde..d869d55d6ec 100644 --- a/Mage/src/main/java/mage/cards/decks/DeckFormats.java +++ b/Mage/src/main/java/mage/cards/decks/DeckFormats.java @@ -1,16 +1,21 @@ package mage.cards.decks; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Optional; + +import javax.swing.filechooser.FileFilter; + import mage.cards.decks.exporter.DeckExporter; import mage.cards.decks.exporter.MtgArenaDeckExporter; import mage.cards.decks.exporter.MtgOnlineDeckExporter; import mage.cards.decks.exporter.XmageDeckExporter; - -import javax.swing.filechooser.FileFilter; -import java.io.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Optional; import mage.cards.decks.exporter.XmageInfoDeckExporter; public enum DeckFormats { diff --git a/Mage/src/main/java/mage/cards/decks/DeckFormatsTest.java b/Mage/src/main/java/mage/cards/decks/DeckFormatsTest.java index 2b0e71e5027..dedf261678a 100644 --- a/Mage/src/main/java/mage/cards/decks/DeckFormatsTest.java +++ b/Mage/src/main/java/mage/cards/decks/DeckFormatsTest.java @@ -1,11 +1,11 @@ package mage.cards.decks; -import org.junit.Assert; -import org.junit.Test; - import java.util.HashMap; import java.util.Map; +import org.junit.Assert; +import org.junit.Test; + /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/cards/decks/DeckValidator.java b/Mage/src/main/java/mage/cards/decks/DeckValidator.java index 506fd6310ba..dff458b7ddc 100644 --- a/Mage/src/main/java/mage/cards/decks/DeckValidator.java +++ b/Mage/src/main/java/mage/cards/decks/DeckValidator.java @@ -1,12 +1,12 @@ package mage.cards.decks; -import mage.cards.Card; - import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import mage.cards.Card; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/cards/decks/DeckValidatorFactory.java b/Mage/src/main/java/mage/cards/decks/DeckValidatorFactory.java index b65ec5925bd..48624b503c7 100644 --- a/Mage/src/main/java/mage/cards/decks/DeckValidatorFactory.java +++ b/Mage/src/main/java/mage/cards/decks/DeckValidatorFactory.java @@ -1,12 +1,12 @@ package mage.cards.decks; -import org.apache.log4j.Logger; - import java.lang.reflect.Constructor; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import org.apache.log4j.Logger; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/cards/decks/DnDDeckTargetListener.java b/Mage/src/main/java/mage/cards/decks/DnDDeckTargetListener.java index 5865df3894e..272b6b86e99 100644 --- a/Mage/src/main/java/mage/cards/decks/DnDDeckTargetListener.java +++ b/Mage/src/main/java/mage/cards/decks/DnDDeckTargetListener.java @@ -1,8 +1,5 @@ package mage.cards.decks; -import org.apache.log4j.Logger; - -import javax.swing.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; import java.awt.dnd.DropTargetAdapter; @@ -14,6 +11,10 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; +import javax.swing.TransferHandler; + +import org.apache.log4j.Logger; + public class DnDDeckTargetListener extends DropTargetAdapter { private static final transient Logger logger = Logger.getLogger(DnDDeckTargetListener.class); diff --git a/Mage/src/main/java/mage/cards/decks/exporter/DeckExporter.java b/Mage/src/main/java/mage/cards/decks/exporter/DeckExporter.java index d9a4b8ab40b..221faf8cae2 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/DeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/DeckExporter.java @@ -1,14 +1,15 @@ package mage.cards.decks.exporter; -import mage.cards.decks.DeckCardLists; -import mage.cards.decks.DeckFormats; - -import javax.swing.filechooser.FileFilter; import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; +import javax.swing.filechooser.FileFilter; + +import mage.cards.decks.DeckCardLists; +import mage.cards.decks.DeckFormats; + public abstract class DeckExporter { public void writeDeck(String file, DeckCardLists deck) throws IOException { diff --git a/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporter.java b/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporter.java index 68073ae2ccc..4ce800dfde1 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporter.java @@ -1,14 +1,20 @@ package mage.cards.decks.exporter; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import javax.swing.filechooser.FileFilter; + import com.google.common.collect.ImmutableMap; + import mage.cards.decks.DeckCardInfo; import mage.cards.decks.DeckCardLists; import mage.cards.decks.DeckFileFilter; -import javax.swing.filechooser.FileFilter; -import java.io.PrintWriter; -import java.util.*; - /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporterTest.java b/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporterTest.java index af7666a45d9..2c6a7b03126 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporterTest.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporterTest.java @@ -1,13 +1,14 @@ package mage.cards.decks.exporter; -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLists; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import org.junit.Test; + +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLists; /** * @author JayDi85 diff --git a/Mage/src/main/java/mage/cards/decks/exporter/MtgOnlineDeckExporter.java b/Mage/src/main/java/mage/cards/decks/exporter/MtgOnlineDeckExporter.java index 5cf545b9116..2495ddec93d 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/MtgOnlineDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/MtgOnlineDeckExporter.java @@ -1,16 +1,17 @@ package mage.cards.decks.exporter; -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLists; -import mage.cards.decks.DeckFileFilter; - -import javax.swing.filechooser.FileFilter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.swing.filechooser.FileFilter; + +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLists; +import mage.cards.decks.DeckFileFilter; + public class MtgOnlineDeckExporter extends DeckExporter { private final String ext = "dek"; diff --git a/Mage/src/main/java/mage/cards/decks/exporter/XmageDeckExporter.java b/Mage/src/main/java/mage/cards/decks/exporter/XmageDeckExporter.java index c3e18fe023d..458cf16df6d 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/XmageDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/XmageDeckExporter.java @@ -1,17 +1,18 @@ package mage.cards.decks.exporter; -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLayout; -import mage.cards.decks.DeckCardLists; -import mage.cards.decks.DeckFileFilter; - -import javax.swing.filechooser.FileFilter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.swing.filechooser.FileFilter; + +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLayout; +import mage.cards.decks.DeckCardLists; +import mage.cards.decks.DeckFileFilter; + public class XmageDeckExporter extends DeckExporter { diff --git a/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java b/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java index 09d3278925b..8e4b6449393 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java @@ -1,16 +1,17 @@ package mage.cards.decks.exporter; -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLayout; -import mage.cards.decks.DeckCardLists; -import mage.cards.decks.DeckFileFilter; - -import javax.swing.filechooser.FileFilter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import javax.swing.filechooser.FileFilter; + +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLayout; +import mage.cards.decks.DeckCardLists; +import mage.cards.decks.DeckFileFilter; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; diff --git a/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java index f7d874f0410..308a35207c3 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java @@ -1,16 +1,16 @@ package mage.cards.decks.importer; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import mage.cards.decks.DeckCardInfo; import mage.cards.decks.DeckCardLayout; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * @author North */ diff --git a/Mage/src/main/java/mage/cards/decks/importer/DecDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DecDeckImporter.java index 5ab07af1de4..35346fe82a9 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DecDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DecDeckImporter.java @@ -6,7 +6,6 @@ import java.util.Optional; import mage.cards.decks.DeckCardInfo; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardInfo; -import mage.cards.repository.CardRepository; /** * diff --git a/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java index dd153c5abe4..dab58f685dd 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java @@ -1,15 +1,12 @@ package mage.cards.decks.importer; -import org.apache.log4j.Logger; import java.io.File; import java.util.Locale; -import java.util.Optional; import java.util.Scanner; +import org.apache.log4j.Logger; import mage.cards.decks.DeckCardLists; -import mage.cards.repository.CardInfo; -import mage.cards.repository.CardRepository; public abstract class DeckImporter { diff --git a/Mage/src/main/java/mage/cards/decks/importer/DraftLogImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DraftLogImporter.java index 5914165f1c3..5ec84422f62 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DraftLogImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DraftLogImporter.java @@ -1,14 +1,14 @@ package mage.cards.decks.importer; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import mage.cards.decks.DeckCardInfo; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class DraftLogImporter extends PlainTextDeckImporter { private static Pattern SET_PATTERN = Pattern.compile("------ (\\p{Alnum}+) ------$"); diff --git a/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java index 7c23d28c60b..86e2e288937 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java @@ -7,7 +7,6 @@ import mage.cards.decks.DeckCardInfo; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; -import mage.cards.repository.CardRepository; import mage.util.RandomUtil; /** diff --git a/Mage/src/main/java/mage/cards/decks/importer/MtgaImporter.java b/Mage/src/main/java/mage/cards/decks/importer/MtgaImporter.java index 4949690873e..53c9e27d261 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/MtgaImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/MtgaImporter.java @@ -1,11 +1,6 @@ package mage.cards.decks.importer; -import com.google.common.collect.ImmutableMap; -import mage.cards.decks.CardNameUtil; -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLists; -import mage.cards.repository.CardCriteria; -import mage.cards.repository.CardInfo; +import static mage.cards.decks.CardNameUtil.CARD_NAME_PATTERN; import java.util.Collections; import java.util.List; @@ -14,7 +9,12 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static mage.cards.decks.CardNameUtil.CARD_NAME_PATTERN; +import com.google.common.collect.ImmutableMap; + +import mage.cards.decks.CardNameUtil; +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLists; +import mage.cards.repository.CardInfo; public class MtgaImporter extends PlainTextDeckImporter { diff --git a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java index 831b09f3649..c8794a7af64 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java @@ -1,16 +1,16 @@ package mage.cards.decks.importer; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; + import mage.cards.decks.CardNameUtil; import mage.cards.decks.DeckCardInfo; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Locale; -import java.util.Set; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/cards/mock/MockCard.java b/Mage/src/main/java/mage/cards/mock/MockCard.java index 8598688a8d0..2bfb608b7fe 100644 --- a/Mage/src/main/java/mage/cards/mock/MockCard.java +++ b/Mage/src/main/java/mage/cards/mock/MockCard.java @@ -1,5 +1,9 @@ package mage.cards.mock; +import java.util.List; + +import org.apache.log4j.Logger; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; @@ -8,9 +12,6 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.cards.CardImpl; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import org.apache.log4j.Logger; - -import java.util.List; /** * Mock card for GUI (deck editor and panels) diff --git a/Mage/src/main/java/mage/cards/mock/MockSplitCard.java b/Mage/src/main/java/mage/cards/mock/MockSplitCard.java index 7858ba1e656..3f31fb161d3 100644 --- a/Mage/src/main/java/mage/cards/mock/MockSplitCard.java +++ b/Mage/src/main/java/mage/cards/mock/MockSplitCard.java @@ -1,5 +1,7 @@ package mage.cards.mock; +import java.util.List; + import mage.MageInt; import mage.abilities.Ability; import mage.cards.CardSetInfo; @@ -10,8 +12,6 @@ import mage.cards.repository.CardRepository; import mage.constants.CardType; import mage.constants.SpellAbilityType; -import java.util.List; - /** * @author North */ diff --git a/Mage/src/main/java/mage/cards/repository/CardCriteria.java b/Mage/src/main/java/mage/cards/repository/CardCriteria.java index 85882512b24..c4324640fc3 100644 --- a/Mage/src/main/java/mage/cards/repository/CardCriteria.java +++ b/Mage/src/main/java/mage/cards/repository/CardCriteria.java @@ -1,13 +1,15 @@ package mage.cards.repository; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.SelectArg; -import com.j256.ormlite.stmt.Where; import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + +import com.j256.ormlite.stmt.QueryBuilder; +import com.j256.ormlite.stmt.SelectArg; +import com.j256.ormlite.stmt.Where; + import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java index 10e2e4cd3ca..a480cb8c63a 100644 --- a/Mage/src/main/java/mage/cards/repository/CardInfo.java +++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java @@ -1,22 +1,38 @@ package mage.cards.repository; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import org.apache.log4j.Logger; + import com.j256.ormlite.field.DataType; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; + import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility; -import mage.cards.*; +import mage.cards.AdventureCard; +import mage.cards.Card; +import mage.cards.CardGraphicInfo; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.cards.FrameStyle; +import mage.cards.SplitCard; import mage.cards.mock.MockCard; import mage.cards.mock.MockSplitCard; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.SpellAbilityType; +import mage.constants.SubType; +import mage.constants.SuperType; import mage.util.CardUtil; import mage.util.SubTypeList; -import org.apache.log4j.Logger; - -import java.util.*; -import java.util.stream.Collectors; /** * @author North diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index d77c31bd1ad..93a15eda778 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -1,5 +1,17 @@ package mage.cards.repository; +import java.io.File; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Set; +import java.util.TreeSet; + +import org.apache.log4j.Logger; + import com.j256.ormlite.dao.Dao; import com.j256.ormlite.dao.DaoManager; import com.j256.ormlite.dao.GenericRawResults; @@ -10,16 +22,12 @@ import com.j256.ormlite.stmt.Where; import com.j256.ormlite.support.ConnectionSource; import com.j256.ormlite.support.DatabaseConnection; import com.j256.ormlite.table.TableUtils; + import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SuperType; import mage.game.events.Listener; import mage.util.RandomUtil; -import org.apache.log4j.Logger; - -import java.io.File; -import java.sql.SQLException; -import java.util.*; /** * @author North, JayDi85 diff --git a/Mage/src/main/java/mage/cards/repository/CardScanner.java b/Mage/src/main/java/mage/cards/repository/CardScanner.java index 6660c6da847..e9d8b6ac841 100644 --- a/Mage/src/main/java/mage/cards/repository/CardScanner.java +++ b/Mage/src/main/java/mage/cards/repository/CardScanner.java @@ -1,12 +1,18 @@ package mage.cards.repository; -import mage.cards.*; -import org.apache.log4j.Logger; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.apache.log4j.Logger; + +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.cards.ExpansionSet; +import mage.cards.Sets; +import mage.cards.SplitCard; + /** * @author North */ diff --git a/Mage/src/main/java/mage/cards/repository/ExpansionInfo.java b/Mage/src/main/java/mage/cards/repository/ExpansionInfo.java index 8b17210ea50..e1aaa304db7 100644 --- a/Mage/src/main/java/mage/cards/repository/ExpansionInfo.java +++ b/Mage/src/main/java/mage/cards/repository/ExpansionInfo.java @@ -1,13 +1,14 @@ package mage.cards.repository; +import java.util.Date; + import com.j256.ormlite.field.DataType; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; + import mage.cards.ExpansionSet; import mage.constants.SetType; -import java.util.Date; - /** * @author North */ diff --git a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java index 6370e4cbfc8..3a7f174aae4 100644 --- a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java +++ b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java @@ -1,5 +1,14 @@ package mage.cards.repository; +import java.io.File; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +import org.apache.log4j.Logger; + import com.j256.ormlite.dao.Dao; import com.j256.ormlite.dao.DaoManager; import com.j256.ormlite.dao.GenericRawResults; @@ -8,15 +17,8 @@ import com.j256.ormlite.stmt.QueryBuilder; import com.j256.ormlite.stmt.SelectArg; import com.j256.ormlite.support.ConnectionSource; import com.j256.ormlite.table.TableUtils; -import mage.game.events.Listener; -import org.apache.log4j.Logger; -import java.io.File; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import mage.game.events.Listener; /** * @author North, JayDi85 diff --git a/Mage/src/main/java/mage/cards/repository/RepositoryEvent.java b/Mage/src/main/java/mage/cards/repository/RepositoryEvent.java index 2056f747199..3668cb9da20 100644 --- a/Mage/src/main/java/mage/cards/repository/RepositoryEvent.java +++ b/Mage/src/main/java/mage/cards/repository/RepositoryEvent.java @@ -1,10 +1,10 @@ package mage.cards.repository; -import mage.game.events.ExternalEvent; - import java.io.Serializable; import java.util.EventObject; +import mage.game.events.ExternalEvent; + /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/cards/repository/RepositoryEventSource.java b/Mage/src/main/java/mage/cards/repository/RepositoryEventSource.java index 33dda83d60f..a22f8159e34 100644 --- a/Mage/src/main/java/mage/cards/repository/RepositoryEventSource.java +++ b/Mage/src/main/java/mage/cards/repository/RepositoryEventSource.java @@ -1,11 +1,11 @@ package mage.cards.repository; +import java.io.Serializable; + import mage.game.events.EventDispatcher; import mage.game.events.EventSource; import mage.game.events.Listener; -import java.io.Serializable; - /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java b/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java index 07086fa0f41..063ac5888cd 100644 --- a/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java +++ b/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java @@ -1,5 +1,10 @@ package mage.cards.repository; +import java.sql.SQLException; +import java.util.List; + +import org.apache.log4j.Logger; + import com.j256.ormlite.dao.Dao; import com.j256.ormlite.dao.DaoManager; import com.j256.ormlite.stmt.DeleteBuilder; @@ -7,11 +12,8 @@ import com.j256.ormlite.stmt.QueryBuilder; import com.j256.ormlite.stmt.SelectArg; import com.j256.ormlite.support.ConnectionSource; import com.j256.ormlite.table.TableUtils; -import mage.util.JarVersion; -import org.apache.log4j.Logger; -import java.sql.SQLException; -import java.util.List; +import mage.util.JarVersion; /** * @author North, JayDi85 diff --git a/Mage/src/main/java/mage/choices/ChoiceColor.java b/Mage/src/main/java/mage/choices/ChoiceColor.java index 9e7109654f3..43f6b0c6b88 100644 --- a/Mage/src/main/java/mage/choices/ChoiceColor.java +++ b/Mage/src/main/java/mage/choices/ChoiceColor.java @@ -1,12 +1,12 @@ package mage.choices; +import java.util.ArrayList; +import java.util.List; + import mage.MageObject; import mage.Mana; import mage.ObjectColor; -import java.util.ArrayList; -import java.util.List; - /** * @author BetaSteward_at_googlemail.com, JayDi85 */ diff --git a/Mage/src/main/java/mage/choices/ChoiceCreatureType.java b/Mage/src/main/java/mage/choices/ChoiceCreatureType.java index c17b5ac9e47..aaff7acb3b8 100644 --- a/Mage/src/main/java/mage/choices/ChoiceCreatureType.java +++ b/Mage/src/main/java/mage/choices/ChoiceCreatureType.java @@ -1,11 +1,11 @@ package mage.choices; -import mage.MageObject; -import mage.constants.SubType; - import java.util.LinkedHashSet; import java.util.stream.Collectors; +import mage.MageObject; +import mage.constants.SubType; + public class ChoiceCreatureType extends ChoiceImpl { private static String DEFAULT_MESSAGE = "Choose a creature type"; diff --git a/Mage/src/main/java/mage/choices/ChoiceImpl.java b/Mage/src/main/java/mage/choices/ChoiceImpl.java index 66ea9d37c1b..4446880ac16 100644 --- a/Mage/src/main/java/mage/choices/ChoiceImpl.java +++ b/Mage/src/main/java/mage/choices/ChoiceImpl.java @@ -1,9 +1,13 @@ package mage.choices; -import mage.util.RandomUtil; - import java.io.Serializable; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import mage.util.RandomUtil; /** * @author BetaSteward_at_googlemail.com, JayDi85 diff --git a/Mage/src/main/java/mage/choices/ChoiceLandType.java b/Mage/src/main/java/mage/choices/ChoiceLandType.java index 12cca314a6e..c09e7a2ff69 100644 --- a/Mage/src/main/java/mage/choices/ChoiceLandType.java +++ b/Mage/src/main/java/mage/choices/ChoiceLandType.java @@ -1,9 +1,9 @@ package mage.choices; -import mage.constants.SubType; - import java.util.stream.Collectors; +import mage.constants.SubType; + /** * @author tre3qwerty */ diff --git a/Mage/src/main/java/mage/choices/Choices.java b/Mage/src/main/java/mage/choices/Choices.java index 9bb5c0910db..272f77b3ed6 100644 --- a/Mage/src/main/java/mage/choices/Choices.java +++ b/Mage/src/main/java/mage/choices/Choices.java @@ -1,15 +1,15 @@ package mage.choices; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + import mage.abilities.Ability; import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/choices/ChooseFriendsAndFoes.java b/Mage/src/main/java/mage/choices/ChooseFriendsAndFoes.java index 6ab7e4891d7..26029fbd480 100644 --- a/Mage/src/main/java/mage/choices/ChooseFriendsAndFoes.java +++ b/Mage/src/main/java/mage/choices/ChooseFriendsAndFoes.java @@ -8,6 +8,7 @@ package mage.choices; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.constants.Outcome; import mage.game.Game; diff --git a/Mage/src/main/java/mage/constants/CardType.java b/Mage/src/main/java/mage/constants/CardType.java index 821db4a1ba3..b7471f92130 100644 --- a/Mage/src/main/java/mage/constants/CardType.java +++ b/Mage/src/main/java/mage/constants/CardType.java @@ -1,12 +1,12 @@ package mage.constants; +import java.util.Arrays; +import java.util.EnumSet; + import mage.MageObject; import mage.filter.predicate.Predicate; import mage.game.Game; -import java.util.Arrays; -import java.util.EnumSet; - /** * @author North */ diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java index 2fb4ea04106..15374245636 100644 --- a/Mage/src/main/java/mage/constants/SubType.java +++ b/Mage/src/main/java/mage/constants/SubType.java @@ -1,15 +1,15 @@ package mage.constants; -import mage.MageObject; -import mage.filter.predicate.Predicate; -import mage.game.Game; -import mage.util.SubTypeList; - import java.util.Arrays; import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; +import mage.MageObject; +import mage.filter.predicate.Predicate; +import mage.game.Game; +import mage.util.SubTypeList; + public enum SubType { //205.3k Instants and sorceries share their lists of subtypes; these subtypes are called spell types. diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index ffe2b05a623..ca149a4215f 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -1,5 +1,7 @@ package mage.constants; +import java.util.UUID; + import mage.cards.Card; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; @@ -9,8 +11,6 @@ import mage.game.Controllable; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * @author North */ diff --git a/Mage/src/main/java/mage/counters/Counter.java b/Mage/src/main/java/mage/counters/Counter.java index 1844fa5d3fa..cecf9f5a0bb 100644 --- a/Mage/src/main/java/mage/counters/Counter.java +++ b/Mage/src/main/java/mage/counters/Counter.java @@ -2,6 +2,7 @@ package mage.counters; import java.io.Serializable; + import org.apache.log4j.Logger; /** diff --git a/Mage/src/main/java/mage/designations/Designation.java b/Mage/src/main/java/mage/designations/Designation.java index 3554e68c508..131fc538534 100644 --- a/Mage/src/main/java/mage/designations/Designation.java +++ b/Mage/src/main/java/mage/designations/Designation.java @@ -1,5 +1,10 @@ package mage.designations; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.UUID; + import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -19,11 +24,6 @@ import mage.game.events.ZoneChangeEvent; import mage.util.GameLog; import mage.util.SubTypeList; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/filter/Filter.java b/Mage/src/main/java/mage/filter/Filter.java index 3f839a0f649..3759a8d1e31 100644 --- a/Mage/src/main/java/mage/filter/Filter.java +++ b/Mage/src/main/java/mage/filter/Filter.java @@ -3,6 +3,7 @@ package mage.filter; import java.io.Serializable; import java.util.List; + import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/FilterCard.java b/Mage/src/main/java/mage/filter/FilterCard.java index b9c3e18fa61..f02a6602a19 100644 --- a/Mage/src/main/java/mage/filter/FilterCard.java +++ b/Mage/src/main/java/mage/filter/FilterCard.java @@ -5,9 +5,14 @@ import java.util.List; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; + import mage.cards.Card; import mage.constants.TargetController; -import mage.filter.predicate.*; +import mage.filter.predicate.ObjectPlayer; +import mage.filter.predicate.ObjectPlayerPredicate; +import mage.filter.predicate.ObjectSourcePlayer; +import mage.filter.predicate.Predicate; +import mage.filter.predicate.Predicates; import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/filter/FilterImpl.java b/Mage/src/main/java/mage/filter/FilterImpl.java index b30a61f4f48..887a99b8e6f 100644 --- a/Mage/src/main/java/mage/filter/FilterImpl.java +++ b/Mage/src/main/java/mage/filter/FilterImpl.java @@ -2,6 +2,7 @@ package mage.filter; import java.util.ArrayList; import java.util.List; + import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/FilterInPlay.java b/Mage/src/main/java/mage/filter/FilterInPlay.java index db4b65b2c69..cf948d1d84c 100644 --- a/Mage/src/main/java/mage/filter/FilterInPlay.java +++ b/Mage/src/main/java/mage/filter/FilterInPlay.java @@ -3,6 +3,7 @@ package mage.filter; import java.util.UUID; + import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/filter/FilterPermanent.java b/Mage/src/main/java/mage/filter/FilterPermanent.java index 63ec4379e38..2b912353dad 100644 --- a/Mage/src/main/java/mage/filter/FilterPermanent.java +++ b/Mage/src/main/java/mage/filter/FilterPermanent.java @@ -1,5 +1,10 @@ package mage.filter; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.constants.SubType; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; @@ -8,11 +13,6 @@ import mage.filter.predicate.Predicates; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.UUID; - /** * @author North */ diff --git a/Mage/src/main/java/mage/filter/FilterPlayer.java b/Mage/src/main/java/mage/filter/FilterPlayer.java index 85e26cff854..c58f2baa7ed 100644 --- a/Mage/src/main/java/mage/filter/FilterPlayer.java +++ b/Mage/src/main/java/mage/filter/FilterPlayer.java @@ -1,5 +1,9 @@ package mage.filter; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; import mage.filter.predicate.ObjectSourcePlayer; @@ -7,10 +11,6 @@ import mage.filter.predicate.Predicates; import mage.game.Game; import mage.players.Player; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com * @author North diff --git a/Mage/src/main/java/mage/filter/FilterSpell.java b/Mage/src/main/java/mage/filter/FilterSpell.java index 377ea63b0b7..6334c1243d3 100644 --- a/Mage/src/main/java/mage/filter/FilterSpell.java +++ b/Mage/src/main/java/mage/filter/FilterSpell.java @@ -2,6 +2,7 @@ package mage.filter; import java.util.UUID; + import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackObject; diff --git a/Mage/src/main/java/mage/filter/FilterStackObject.java b/Mage/src/main/java/mage/filter/FilterStackObject.java index 789c2d3267e..0626cba1e31 100644 --- a/Mage/src/main/java/mage/filter/FilterStackObject.java +++ b/Mage/src/main/java/mage/filter/FilterStackObject.java @@ -1,5 +1,9 @@ package mage.filter; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; import mage.filter.predicate.ObjectSourcePlayer; @@ -8,10 +12,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author North */ diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index 7e71f5e9cf1..d764f3a23f6 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -9,7 +9,28 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; -import mage.filter.common.*; +import mage.filter.common.FilterArtifactCard; +import mage.filter.common.FilterArtifactCreaturePermanent; +import mage.filter.common.FilterArtifactOrEnchantmentPermanent; +import mage.filter.common.FilterArtifactPermanent; +import mage.filter.common.FilterBasicLandCard; +import mage.filter.common.FilterControlledArtifactPermanent; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.common.FilterControlledLandPermanent; +import mage.filter.common.FilterControlledPermanent; +import mage.filter.common.FilterCreatureCard; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterCreatureSpell; +import mage.filter.common.FilterEnchantmentCard; +import mage.filter.common.FilterEnchantmentPermanent; +import mage.filter.common.FilterInstantOrSorceryCard; +import mage.filter.common.FilterLandCard; +import mage.filter.common.FilterLandPermanent; +import mage.filter.common.FilterNoncreatureCard; +import mage.filter.common.FilterNonlandCard; +import mage.filter.common.FilterNonlandPermanent; +import mage.filter.common.FilterPlaneswalkerPermanent; +import mage.filter.common.FilterSpiritOrArcaneCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.permanent.AnotherPredicate; diff --git a/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java b/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java index 1e8b0d139de..12c06c35e45 100644 --- a/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java +++ b/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java @@ -2,6 +2,7 @@ package mage.filter.common; import java.util.UUID; + import mage.constants.TargetController; import mage.filter.FilterImpl; import mage.filter.FilterInPlay; diff --git a/Mage/src/main/java/mage/filter/common/FilterCreatureAttackingYou.java b/Mage/src/main/java/mage/filter/common/FilterCreatureAttackingYou.java index 4657174caa1..8c32436f20a 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreatureAttackingYou.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreatureAttackingYou.java @@ -2,7 +2,7 @@ package mage.filter.common; import java.util.UUID; -import mage.filter.common.FilterAttackingCreature; + import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java index d44c37311c6..60bc2d3ff2c 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java @@ -2,6 +2,7 @@ package mage.filter.common; import java.util.UUID; + import mage.MageItem; import mage.filter.FilterImpl; import mage.filter.FilterInPlay; diff --git a/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java b/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java index 195bc29124c..34b45ae64ad 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java @@ -3,7 +3,6 @@ package mage.filter.common; import java.util.UUID; import mage.MageItem; -import mage.filter.FilterPlayer; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java index f52643b37fd..cd4f642f6fb 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java @@ -2,6 +2,7 @@ package mage.filter.common; import java.util.UUID; + import mage.MageItem; import mage.filter.FilterImpl; import mage.filter.FilterInPlay; diff --git a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayerWithCounter.java b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayerWithCounter.java index 16c0eb36233..e298a83c0a3 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayerWithCounter.java +++ b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayerWithCounter.java @@ -1,12 +1,12 @@ package mage.filter.common; +import java.util.UUID; + import mage.MageItem; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import java.util.UUID; - /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java index 601bb952bc4..70630370d2e 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java @@ -4,6 +4,7 @@ package mage.filter.common; import java.util.ArrayList; import java.util.Set; import java.util.UUID; + import mage.filter.FilterImpl; import mage.filter.FilterPlayer; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/filter/predicate/Predicate.java b/Mage/src/main/java/mage/filter/predicate/Predicate.java index e4e64de3963..a27dd8692ea 100644 --- a/Mage/src/main/java/mage/filter/predicate/Predicate.java +++ b/Mage/src/main/java/mage/filter/predicate/Predicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate; import java.io.Serializable; + import mage.game.Game; /** diff --git a/Mage/src/main/java/mage/filter/predicate/Predicates.java b/Mage/src/main/java/mage/filter/predicate/Predicates.java index 6e6796c7116..79b75bdba49 100644 --- a/Mage/src/main/java/mage/filter/predicate/Predicates.java +++ b/Mage/src/main/java/mage/filter/predicate/Predicates.java @@ -1,11 +1,11 @@ package mage.filter.predicate; -import mage.game.Game; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.game.Game; + /** * Static utility methods pertaining to {@code Predicate} instances. * diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java index ee93a32a909..3106dec0252 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.mageobject; import java.util.UUID; + import mage.MageItem; import mage.abilities.Mode; import mage.filter.predicate.ObjectSourcePlayer; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java index e04342dd97b..c98425b2702 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.mageobject; import java.util.UUID; + import mage.MageObject; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/EnchantmentOrEnchantedPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/EnchantmentOrEnchantedPredicate.java index ab282fc21a1..ea7babf388a 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/EnchantmentOrEnchantedPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/EnchantmentOrEnchantedPredicate.java @@ -1,12 +1,12 @@ package mage.filter.predicate.mageobject; +import java.util.Objects; + import mage.constants.SubType; import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.Objects; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java index 0acf3d1faa5..4f9f06a8eed 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java @@ -3,6 +3,7 @@ package mage.filter.predicate.mageobject; import java.util.Set; import java.util.UUID; + import mage.MageItem; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java index e5c060ea0d7..cd5f4cad897 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java @@ -2,7 +2,7 @@ package mage.filter.predicate.mageobject; import java.util.UUID; -import mage.MageObject; + import mage.abilities.Mode; import mage.filter.predicate.Predicate; import mage.game.Controllable; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorPredicate.java index a261bf58fc9..d42c44e1268 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorPredicate.java @@ -8,8 +8,6 @@ package mage.filter.predicate.mageobject; import mage.MageObject; import mage.ObjectColor; -import mage.filter.predicate.ObjectSourcePlayer; -import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/VariableManaCostPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/VariableManaCostPredicate.java index 7759d5d3b26..ef492472a44 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/VariableManaCostPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/VariableManaCostPredicate.java @@ -2,7 +2,6 @@ package mage.filter.predicate.mageobject; import mage.MageObject; -import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.VariableManaCost; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java index 6d4b211bcf3..b17e1ea500d 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java @@ -3,6 +3,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.cards.Card; import mage.filter.Filter; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java index 54d3c490ed4..bb4e679dfc1 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java @@ -1,6 +1,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.cards.Card; import mage.filter.Filter; import mage.filter.predicate.Predicate; diff --git a/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java index a52633c2b56..6eedd25e914 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java @@ -2,6 +2,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.filter.Filter; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java index d87cb515c73..11fa0386910 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java @@ -2,6 +2,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.cards.Card; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java index dc284f62002..b120a95d21d 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java @@ -1,5 +1,8 @@ package mage.filter.predicate.other; +import java.util.HashMap; +import java.util.Locale; + import mage.cards.AdventureCard; import mage.cards.Card; import mage.cards.SplitCard; @@ -9,9 +12,6 @@ import mage.constants.SuperType; import mage.filter.predicate.Predicate; import mage.game.Game; -import java.util.HashMap; -import java.util.Locale; - /** * Special predicate to search cards in deck editor * diff --git a/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java index 15c2a46491c..020763b3704 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.cards.Card; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java index 46b073d965a..113daba5a7f 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java @@ -2,6 +2,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/filter/predicate/other/PlayerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/PlayerIdPredicate.java index 105fb306dbe..83fb9ee0d09 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/PlayerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/PlayerIdPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.filter.predicate.Predicate; import mage.game.Game; import mage.players.Player; diff --git a/Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java index 08433ae0890..c174a04b6c9 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java @@ -6,6 +6,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.MageObject; import mage.abilities.Mode; import mage.filter.predicate.ObjectSourcePlayer; diff --git a/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java index 6cf6f6e71b8..f820f512595 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.MageObject; import mage.abilities.Mode; import mage.filter.FilterPermanent; diff --git a/Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java index af8f556bc4d..24962608101 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java @@ -6,6 +6,7 @@ package mage.filter.predicate.other; import java.util.UUID; + import mage.MageObject; import mage.abilities.Mode; import mage.filter.predicate.ObjectSourcePlayer; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java index 9f287b3a930..7de0936bb56 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.permanent; import java.util.UUID; + import mage.filter.FilterPermanent; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/AttackingSameNotBandedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AttackingSameNotBandedPredicate.java index 112dbc3b9a4..a78afc72725 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AttackingSameNotBandedPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AttackingSameNotBandedPredicate.java @@ -1,13 +1,13 @@ package mage.filter.predicate.permanent; +import java.util.UUID; + import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * * @author L_J diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java index 135281a0e14..1d082e530d8 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java @@ -1,6 +1,7 @@ package mage.filter.predicate.permanent; import java.util.UUID; + import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.combat.CombatGroup; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java index 18649a706bc..665be6c0eb9 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.permanent; import java.util.UUID; + import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.combat.CombatGroup; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java index 3fa0071a2d0..74889ba8916 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java @@ -1,12 +1,12 @@ package mage.filter.predicate.permanent; +import java.util.UUID; + import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * * @author North diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIsActivePlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIsActivePlayerPredicate.java index 1f0b7009741..f4d646a185d 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIsActivePlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIsActivePlayerPredicate.java @@ -5,8 +5,6 @@ import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * * @author North diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java index 3fb4305a6b5..681b06c736d 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java @@ -1,5 +1,7 @@ package mage.filter.predicate.permanent; +import java.util.UUID; + import mage.constants.TargetController; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; @@ -7,8 +9,6 @@ import mage.game.Controllable; import mage.game.Game; import mage.watchers.common.PlayerDamagedBySourceWatcher; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/EnchantedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/EnchantedPredicate.java index 71491195df6..1ba5a185bc3 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/EnchantedPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/EnchantedPredicate.java @@ -1,13 +1,13 @@ package mage.filter.predicate.permanent; +import java.util.Objects; + import mage.MageObject; import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.Objects; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/EquippedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/EquippedPredicate.java index c92c4145943..ebaf1e62fa8 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/EquippedPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/EquippedPredicate.java @@ -5,13 +5,13 @@ */ package mage.filter.predicate.permanent; +import java.util.Objects; + import mage.constants.SubType; import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.Objects; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java index c387ee3bcf3..53ef2642ad7 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.permanent; import java.util.UUID; + import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java index 5a03ec6d6d8..1a7171484d9 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java @@ -2,6 +2,7 @@ package mage.filter.predicate.permanent; import java.util.List; + import mage.filter.predicate.Predicate; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/game/CardAttribute.java b/Mage/src/main/java/mage/game/CardAttribute.java index e0f9945ec5a..09adf8d86e4 100644 --- a/Mage/src/main/java/mage/game/CardAttribute.java +++ b/Mage/src/main/java/mage/game/CardAttribute.java @@ -6,6 +6,7 @@ package mage.game; import java.io.Serializable; + import mage.ObjectColor; import mage.cards.Card; import mage.util.SubTypeList; diff --git a/Mage/src/main/java/mage/game/CardState.java b/Mage/src/main/java/mage/game/CardState.java index 7ce8d79f5c2..84778afa213 100644 --- a/Mage/src/main/java/mage/game/CardState.java +++ b/Mage/src/main/java/mage/game/CardState.java @@ -3,6 +3,7 @@ package mage.game; import java.io.Serializable; import java.util.HashMap; import java.util.Map; + import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/game/Exile.java b/Mage/src/main/java/mage/game/Exile.java index a8a4474e402..dca5c589707 100644 --- a/Mage/src/main/java/mage/game/Exile.java +++ b/Mage/src/main/java/mage/game/Exile.java @@ -1,14 +1,19 @@ package mage.game; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.cards.Card; import mage.filter.FilterCard; import mage.util.Copyable; -import java.io.Serializable; -import java.util.*; -import java.util.Map.Entry; -import java.util.stream.Collectors; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/ExileZone.java b/Mage/src/main/java/mage/game/ExileZone.java index 451d2bb249d..510f822b164 100644 --- a/Mage/src/main/java/mage/game/ExileZone.java +++ b/Mage/src/main/java/mage/game/ExileZone.java @@ -1,9 +1,9 @@ package mage.game; -import mage.cards.CardsImpl; - import java.util.UUID; +import mage.cards.CardsImpl; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/Game.java b/Mage/src/main/java/mage/game/Game.java index a38e1f8c111..daa86654578 100644 --- a/Mage/src/main/java/mage/game/Game.java +++ b/Mage/src/main/java/mage/game/Game.java @@ -1,8 +1,16 @@ package mage.game; import java.io.Serializable; -import java.util.*; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; + import mage.MageItem; import mage.MageObject; import mage.abilities.Ability; @@ -18,7 +26,12 @@ import mage.cards.Cards; import mage.cards.MeldCard; import mage.cards.decks.Deck; import mage.choices.Choice; -import mage.constants.*; +import mage.constants.CommanderCardType; +import mage.constants.Duration; +import mage.constants.MultiplayerAttackOption; +import mage.constants.PlayerAction; +import mage.constants.RangeOfInfluence; +import mage.constants.Zone; import mage.counters.Counters; import mage.game.combat.Combat; import mage.game.command.Commander; diff --git a/Mage/src/main/java/mage/game/GameCanadianHighlanderImpl.java b/Mage/src/main/java/mage/game/GameCanadianHighlanderImpl.java index ab7408114aa..b810fea1795 100644 --- a/Mage/src/main/java/mage/game/GameCanadianHighlanderImpl.java +++ b/Mage/src/main/java/mage/game/GameCanadianHighlanderImpl.java @@ -1,14 +1,14 @@ package mage.game; +import java.util.UUID; + import mage.constants.MultiplayerAttackOption; import mage.constants.PhaseStep; import mage.constants.RangeOfInfluence; import mage.game.mulligan.Mulligan; import mage.game.turn.TurnMod; -import java.util.UUID; - public abstract class GameCanadianHighlanderImpl extends GameImpl { public GameCanadianHighlanderImpl(MultiplayerAttackOption attackOption, RangeOfInfluence range, Mulligan mulligan, int startLife) { diff --git a/Mage/src/main/java/mage/game/GameCommanderImpl.java b/Mage/src/main/java/mage/game/GameCommanderImpl.java index 6731f4f39f3..57198289526 100644 --- a/Mage/src/main/java/mage/game/GameCommanderImpl.java +++ b/Mage/src/main/java/mage/game/GameCommanderImpl.java @@ -2,6 +2,7 @@ package mage.game; import java.util.Map; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.InfoEffect; diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index 2fc07a9ac7b..f97e8df34cb 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -1,8 +1,34 @@ package mage.game; +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.Stack; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.MageException; import mage.MageObject; -import mage.abilities.*; +import mage.abilities.Ability; +import mage.abilities.ActivatedAbility; +import mage.abilities.DelayedTriggeredAbility; +import mage.abilities.OpeningHandAction; +import mage.abilities.SpellAbility; +import mage.abilities.TriggeredAbility; import mage.abilities.common.AttachableToRestrictedAbility; import mage.abilities.common.CantHaveMoreThanAmountCountersSourceAbility; import mage.abilities.common.SagaAbility; @@ -17,10 +43,28 @@ import mage.abilities.keyword.TransformAbility; import mage.abilities.mana.DelayedTriggeredManaAbility; import mage.abilities.mana.TriggeredManaAbility; import mage.actions.impl.MageAction; -import mage.cards.*; +import mage.cards.AdventureCard; +import mage.cards.AdventureCardSpell; +import mage.cards.Card; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.cards.MeldCard; +import mage.cards.SplitCard; +import mage.cards.SplitCardHalf; import mage.cards.decks.Deck; import mage.choices.Choice; -import mage.constants.*; +import mage.constants.CommanderCardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.MultiplayerAttackOption; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.PlayerAction; +import mage.constants.RangeOfInfluence; +import mage.constants.SpellAbilityType; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.counters.CounterType; import mage.counters.Counters; import mage.designations.Designation; @@ -37,8 +81,15 @@ import mage.game.command.CommandObject; import mage.game.command.Commander; import mage.game.command.Emblem; import mage.game.command.Plane; -import mage.game.events.*; +import mage.game.events.DamageEvent; +import mage.game.events.GameEvent; +import mage.game.events.Listener; +import mage.game.events.PlayerQueryEvent; +import mage.game.events.PlayerQueryEventSource; +import mage.game.events.PreventDamageEvent; +import mage.game.events.TableEvent; import mage.game.events.TableEvent.EventType; +import mage.game.events.TableEventSource; import mage.game.mulligan.Mulligan; import mage.game.permanent.Battlefield; import mage.game.permanent.Permanent; @@ -61,13 +112,17 @@ import mage.util.GameLog; import mage.util.MessageToClient; import mage.util.RandomUtil; import mage.util.functions.ApplyToPermanent; -import mage.watchers.common.*; -import org.apache.log4j.Logger; - -import java.io.IOException; -import java.io.Serializable; -import java.util.*; -import java.util.Map.Entry; +import mage.watchers.common.BlockedAttackerWatcher; +import mage.watchers.common.BloodthirstWatcher; +import mage.watchers.common.CastSpellLastTurnWatcher; +import mage.watchers.common.CastSpellYourLastTurnWatcher; +import mage.watchers.common.DamageDoneWatcher; +import mage.watchers.common.MorbidWatcher; +import mage.watchers.common.PlanarRollWatcher; +import mage.watchers.common.PlayerDamagedBySourceWatcher; +import mage.watchers.common.PlayerLostLifeNonCombatWatcher; +import mage.watchers.common.PlayerLostLifeWatcher; +import mage.watchers.common.PlayersAttackedThisTurnWatcher; public abstract class GameImpl implements Game, Serializable { diff --git a/Mage/src/main/java/mage/game/GameOptions.java b/Mage/src/main/java/mage/game/GameOptions.java index 81bf98babf1..14cdf713408 100644 --- a/Mage/src/main/java/mage/game/GameOptions.java +++ b/Mage/src/main/java/mage/game/GameOptions.java @@ -1,11 +1,11 @@ package mage.game; -import mage.constants.PhaseStep; - import java.io.Serializable; import java.util.Collections; import java.util.Set; +import mage.constants.PhaseStep; + /** * Game options for Mage game. Mainly used in tests to configure * {@link GameImpl} with specific params. diff --git a/Mage/src/main/java/mage/game/GameState.java b/Mage/src/main/java/mage/game/GameState.java index 5f61dc0dc12..66988a3f0a7 100644 --- a/Mage/src/main/java/mage/game/GameState.java +++ b/Mage/src/main/java/mage/game/GameState.java @@ -1,7 +1,33 @@ package mage.game; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.MageObject; -import mage.abilities.*; +import mage.abilities.Abilities; +import mage.abilities.Ability; +import mage.abilities.ActivatedAbility; +import mage.abilities.DelayedTriggeredAbilities; +import mage.abilities.DelayedTriggeredAbility; +import mage.abilities.MageSingleton; +import mage.abilities.Mode; +import mage.abilities.SpecialActions; +import mage.abilities.StaticAbility; +import mage.abilities.TriggeredAbilities; +import mage.abilities.TriggeredAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffects; import mage.abilities.effects.Effect; @@ -34,10 +60,6 @@ import mage.util.ThreadLocalStringBuilder; import mage.watchers.Watcher; import mage.watchers.Watchers; -import java.io.Serializable; -import java.util.*; -import java.util.stream.Collectors; - /** * @author BetaSteward_at_googlemail.com *

diff --git a/Mage/src/main/java/mage/game/GameStates.java b/Mage/src/main/java/mage/game/GameStates.java index a803a10aea7..aea1ea19040 100644 --- a/Mage/src/main/java/mage/game/GameStates.java +++ b/Mage/src/main/java/mage/game/GameStates.java @@ -4,6 +4,7 @@ package mage.game; import java.io.Serializable; import java.util.LinkedList; import java.util.List; + import org.apache.log4j.Logger; /** diff --git a/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java b/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java index 0a64d1b381f..31a7414b3a1 100644 --- a/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java +++ b/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java @@ -1,5 +1,9 @@ package mage.game; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -11,17 +15,19 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.MultiplayerAttackOption; +import mage.constants.PhaseStep; +import mage.constants.RangeOfInfluence; +import mage.constants.Rarity; +import mage.constants.SuperType; +import mage.constants.Zone; import mage.game.mulligan.Mulligan; import mage.game.turn.TurnMod; import mage.players.Player; import mage.watchers.common.CommanderInfoWatcher; import mage.watchers.common.CommanderPlaysCountWatcher; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * @author JRHerlehy */ diff --git a/Mage/src/main/java/mage/game/LookedAt.java b/Mage/src/main/java/mage/game/LookedAt.java index 2e068eb1027..cb75fa8e4c9 100644 --- a/Mage/src/main/java/mage/game/LookedAt.java +++ b/Mage/src/main/java/mage/game/LookedAt.java @@ -2,16 +2,16 @@ package mage.game; -import mage.cards.Card; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.util.Copyable; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import mage.cards.Card; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.util.Copyable; + /** * * @author nantuko diff --git a/Mage/src/main/java/mage/game/Revealed.java b/Mage/src/main/java/mage/game/Revealed.java index 0ec4349f5dc..59eb59ea0c0 100644 --- a/Mage/src/main/java/mage/game/Revealed.java +++ b/Mage/src/main/java/mage/game/Revealed.java @@ -6,6 +6,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.UUID; + import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; diff --git a/Mage/src/main/java/mage/game/Seat.java b/Mage/src/main/java/mage/game/Seat.java index 95dfeba2f86..f8a1b69f283 100644 --- a/Mage/src/main/java/mage/game/Seat.java +++ b/Mage/src/main/java/mage/game/Seat.java @@ -1,11 +1,11 @@ package mage.game; +import java.io.Serializable; + import mage.players.Player; import mage.players.PlayerType; -import java.io.Serializable; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/Table.java b/Mage/src/main/java/mage/game/Table.java index eba4df35c6b..e8fba037cad 100644 --- a/Mage/src/main/java/mage/game/Table.java +++ b/Mage/src/main/java/mage/game/Table.java @@ -2,7 +2,12 @@ package mage.game; import java.io.Serializable; -import java.util.*; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.cards.decks.DeckValidator; import mage.constants.TableState; import mage.game.events.Listener; diff --git a/Mage/src/main/java/mage/game/Team.java b/Mage/src/main/java/mage/game/Team.java index 6129d73e41b..1fa348ce156 100644 --- a/Mage/src/main/java/mage/game/Team.java +++ b/Mage/src/main/java/mage/game/Team.java @@ -3,6 +3,7 @@ package mage.game; import java.util.UUID; + import mage.MageItem; import mage.players.Player; import mage.players.Players; diff --git a/Mage/src/main/java/mage/game/ZoneChangeInfo.java b/Mage/src/main/java/mage/game/ZoneChangeInfo.java index fa5ab517776..e732714e399 100644 --- a/Mage/src/main/java/mage/game/ZoneChangeInfo.java +++ b/Mage/src/main/java/mage/game/ZoneChangeInfo.java @@ -3,6 +3,7 @@ package mage.game; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.cards.MeldCard; import mage.game.events.ZoneChangeEvent; import mage.game.stack.Spell; diff --git a/Mage/src/main/java/mage/game/ZonesHandler.java b/Mage/src/main/java/mage/game/ZonesHandler.java index d7bac4124be..9ab40d4d700 100644 --- a/Mage/src/main/java/mage/game/ZonesHandler.java +++ b/Mage/src/main/java/mage/game/ZonesHandler.java @@ -1,5 +1,14 @@ package mage.game; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; @@ -18,8 +27,6 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetCard; -import java.util.*; - /** * Created by samuelsandeen on 9/6/16. */ diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index 7f429cda997..1bc0399c599 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -1,5 +1,17 @@ package mage.game.combat; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.RequirementEffect; @@ -31,10 +43,6 @@ import mage.target.common.TargetDefender; import mage.util.CardUtil; import mage.util.Copyable; import mage.util.trace.TraceUtil; -import org.apache.log4j.Logger; - -import java.io.Serializable; -import java.util.*; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java index be2f139af66..0d25e5c01c7 100644 --- a/Mage/src/main/java/mage/game/combat/CombatGroup.java +++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java @@ -2,7 +2,12 @@ package mage.game.combat; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; import java.util.stream.Stream; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/game/command/CommandObject.java b/Mage/src/main/java/mage/game/command/CommandObject.java index 2a376c6b3f0..1bc4950aa06 100644 --- a/Mage/src/main/java/mage/game/command/CommandObject.java +++ b/Mage/src/main/java/mage/game/command/CommandObject.java @@ -2,6 +2,7 @@ package mage.game.command; import java.util.UUID; + import mage.MageObject; import mage.game.Controllable; diff --git a/Mage/src/main/java/mage/game/command/Commander.java b/Mage/src/main/java/mage/game/command/Commander.java index e8a34c3a7d6..2da67ee1954 100644 --- a/Mage/src/main/java/mage/game/command/Commander.java +++ b/Mage/src/main/java/mage/game/command/Commander.java @@ -1,9 +1,17 @@ package mage.game.command; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.MageInt; import mage.MageObject; import mage.ObjectColor; -import mage.abilities.*; +import mage.abilities.Abilities; +import mage.abilities.AbilitiesImpl; +import mage.abilities.Ability; +import mage.abilities.PlayLandAbility; +import mage.abilities.SpellAbility; import mage.abilities.common.CastCommanderAbility; import mage.abilities.common.PlayLandAsCommanderAbility; import mage.abilities.costs.mana.ManaCost; @@ -20,10 +28,6 @@ import mage.game.events.ZoneChangeEvent; import mage.util.GameLog; import mage.util.SubTypeList; -import java.util.List; -import java.util.Set; -import java.util.UUID; - public class Commander implements CommandObject { private final Card sourceObject; diff --git a/Mage/src/main/java/mage/game/command/Emblem.java b/Mage/src/main/java/mage/game/command/Emblem.java index 7a4a8896aa7..69aa6175628 100644 --- a/Mage/src/main/java/mage/game/command/Emblem.java +++ b/Mage/src/main/java/mage/game/command/Emblem.java @@ -1,5 +1,9 @@ package mage.game.command; +import java.util.EnumSet; +import java.util.List; +import java.util.UUID; + import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -22,10 +26,6 @@ import mage.game.events.ZoneChangeEvent; import mage.util.GameLog; import mage.util.SubTypeList; -import java.util.EnumSet; -import java.util.List; -import java.util.UUID; - /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/game/command/Plane.java b/Mage/src/main/java/mage/game/command/Plane.java index d06d5b355bf..13038f420d3 100644 --- a/Mage/src/main/java/mage/game/command/Plane.java +++ b/Mage/src/main/java/mage/game/command/Plane.java @@ -1,5 +1,10 @@ package mage.game.command; +import java.lang.reflect.Constructor; +import java.util.EnumSet; +import java.util.List; +import java.util.UUID; + import mage.MageInt; import mage.MageObject; import mage.ObjectColor; @@ -24,11 +29,6 @@ import mage.util.GameLog; import mage.util.RandomUtil; import mage.util.SubTypeList; -import java.lang.reflect.Constructor; -import java.util.EnumSet; -import java.util.List; -import java.util.UUID; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java index 25f7674a4e6..78eba03d957 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java @@ -4,6 +4,7 @@ package mage.game.command.emblems; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.SpellAbility; diff --git a/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java index fbb1cee20d8..700e10975af 100644 --- a/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java @@ -1,5 +1,7 @@ package mage.game.command.emblems; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.Effect; @@ -13,8 +15,6 @@ import mage.game.stack.Spell; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.SpellsCastWatcher; -import java.util.List; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java b/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java index 0de0f51a969..eb81bc5ce08 100644 --- a/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java @@ -6,6 +6,7 @@ package mage.game.command.emblems; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.AsThoughEffectImpl; diff --git a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java index ad4ecfda6d6..c09c03af7ac 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -7,8 +7,13 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; -import mage.constants.*; - +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SubType; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.command.Emblem; diff --git a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java index 32a2fb8daf5..15ddd399595 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java @@ -1,19 +1,14 @@ package mage.game.command.emblems; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.PreventionEffectImpl; -import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; -import mage.abilities.effects.common.PreventAllDamageToPlayersEffect; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.TurnPhase; +import mage.constants.Zone; import mage.game.Game; import mage.game.command.Emblem; import mage.game.events.GameEvent; -import mage.game.permanent.token.CatToken2; -import mage.game.turn.Phase; import mage.players.Player; /** diff --git a/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java b/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java index a0c9ae89056..4bcde089096 100644 --- a/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java @@ -1,5 +1,7 @@ package mage.game.command.emblems; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -21,8 +23,6 @@ import mage.game.permanent.token.EmptyToken; import mage.util.CardUtil; import mage.util.RandomUtil; -import java.util.List; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java index 4131d1b3237..5e4f674e304 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java @@ -1,6 +1,8 @@ package mage.game.command.emblems; +import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; + import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -11,7 +13,6 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.constants.Zone; -import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.game.command.Emblem; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java index f730fc2d4b1..1e31fa30f89 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java @@ -1,6 +1,8 @@ package mage.game.command.emblems; +import static mage.filter.StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT; + import mage.abilities.Ability; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.Effect; @@ -10,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; -import static mage.filter.StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT; import mage.game.command.Emblem; import mage.target.TargetPermanent; diff --git a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java index cda33d8faa7..0a4cfd0a90e 100644 --- a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java @@ -1,18 +1,22 @@ package mage.game.command.emblems; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.RetraceAbility; import mage.cards.AdventureCard; import mage.cards.Card; -import mage.constants.*; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.Zone; import mage.game.Game; import mage.game.command.Emblem; import mage.players.Player; -import java.util.UUID; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java b/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java index e8b54b8e296..2aed3102bdd 100644 --- a/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java b/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java index e879dd60547..a1f3d679a2a 100644 --- a/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java @@ -1,5 +1,9 @@ package mage.game.command.planes; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -29,10 +33,6 @@ import mage.target.Target; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.PlanarRollWatcher; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java index 3582cc94828..d2b94c25335 100644 --- a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MainPhaseStackEmptyCondition; diff --git a/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java b/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java index 15260c05f5b..193d3f77cdd 100644 --- a/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java @@ -1,5 +1,9 @@ package mage.game.command.planes; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -20,10 +24,6 @@ import mage.target.Target; import mage.watchers.common.AttackedThisTurnWatcher; import mage.watchers.common.PlanarRollWatcher; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/command/planes/BantPlane.java b/Mage/src/main/java/mage/game/command/planes/BantPlane.java index 5ea0fc27e6d..f44e26630f3 100644 --- a/Mage/src/main/java/mage/game/command/planes/BantPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/BantPlane.java @@ -4,6 +4,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java b/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java index 4a29f9fd16d..24872fec615 100644 --- a/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java @@ -5,16 +5,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MainPhaseStackEmptyCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RollPlanarDieEffect; -import mage.abilities.effects.common.SkipUntapStepEffect; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.constants.Duration; diff --git a/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java b/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java index 04fb098a1fb..8a67a6f6b04 100644 --- a/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.MageObject; import mage.ObjectColor; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java b/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java index f8444d6fc8a..6ed51a03edb 100644 --- a/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java b/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java index 06cb2d410e4..ef59f02d853 100644 --- a/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java @@ -1,5 +1,8 @@ package mage.game.command.planes; +import java.util.ArrayList; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -22,9 +25,6 @@ import mage.game.permanent.token.EldraziAnnihilatorToken; import mage.target.Target; import mage.watchers.common.PlanarRollWatcher; -import java.util.ArrayList; -import java.util.List; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java b/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java index ca7299dc14c..4130aafd5cb 100644 --- a/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/NayaPlane.java b/Mage/src/main/java/mage/game/command/planes/NayaPlane.java index 335eba469a3..b51bca4381d 100644 --- a/Mage/src/main/java/mage/game/command/planes/NayaPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/NayaPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java b/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java index 3f2123ecfb1..11c7f295839 100644 --- a/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java @@ -2,6 +2,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.ActivateIfConditionActivatedAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java b/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java index e1accd02cb6..7daba37b086 100644 --- a/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java @@ -1,5 +1,8 @@ package mage.game.command.planes; +import java.util.ArrayList; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.ActivateIfConditionActivatedAbility; @@ -22,9 +25,6 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.watchers.common.PlanarRollWatcher; -import java.util.ArrayList; -import java.util.List; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java b/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java index 1ca83d8f7b0..f09e426b5d3 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java b/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java index 75592637a0b..02c82b82ab7 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java b/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java index 329a91b5e81..903d3a9be55 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -13,7 +14,6 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.RollPlanarDieEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; -import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.constants.Duration; import mage.constants.Layer; diff --git a/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java b/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java index 74fd5f5edcd..167945654a3 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java b/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java index fe00e2898df..ba3cb316fe4 100644 --- a/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java b/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java index 24ca5e3f43d..d54d48062a4 100644 --- a/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.IsStillOnPlaneCondition; diff --git a/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java b/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java index 16b5665f2df..cb9b193a84e 100644 --- a/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.ActivateIfConditionActivatedAbility; diff --git a/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java b/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java index 1bb70f17f67..fb7610f3a24 100644 --- a/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java @@ -3,6 +3,7 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; + import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.ActivateIfConditionActivatedAbility; diff --git a/Mage/src/main/java/mage/game/draft/BoosterDraft.java b/Mage/src/main/java/mage/game/draft/BoosterDraft.java index 480d96b1831..f06b0f77ded 100644 --- a/Mage/src/main/java/mage/game/draft/BoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/BoosterDraft.java @@ -3,6 +3,7 @@ package mage.game.draft; import java.util.List; + import mage.cards.ExpansionSet; /** diff --git a/Mage/src/main/java/mage/game/draft/Draft.java b/Mage/src/main/java/mage/game/draft/Draft.java index 8fef779f78d..42f060d31a7 100644 --- a/Mage/src/main/java/mage/game/draft/Draft.java +++ b/Mage/src/main/java/mage/game/draft/Draft.java @@ -7,6 +7,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; import java.util.UUID; + import mage.MageItem; import mage.cards.ExpansionSet; import mage.game.events.Listener; diff --git a/Mage/src/main/java/mage/game/draft/DraftCube.java b/Mage/src/main/java/mage/game/draft/DraftCube.java index 7854940ccbd..2df081abaa4 100644 --- a/Mage/src/main/java/mage/game/draft/DraftCube.java +++ b/Mage/src/main/java/mage/game/draft/DraftCube.java @@ -4,11 +4,13 @@ package mage.game.draft; import java.util.ArrayList; import java.util.List; import java.util.Objects; + +import org.apache.log4j.Logger; + import mage.cards.Card; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.util.RandomUtil; -import org.apache.log4j.Logger; /** * diff --git a/Mage/src/main/java/mage/game/draft/DraftImpl.java b/Mage/src/main/java/mage/game/draft/DraftImpl.java index 5ef5a2330ea..0e015a56e69 100644 --- a/Mage/src/main/java/mage/game/draft/DraftImpl.java +++ b/Mage/src/main/java/mage/game/draft/DraftImpl.java @@ -1,12 +1,24 @@ package mage.game.draft; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + import mage.cards.Card; import mage.cards.ExpansionSet; import mage.game.draft.DraftOptions.TimingOption; -import mage.game.events.*; +import mage.game.events.Listener; +import mage.game.events.PlayerQueryEvent; +import mage.game.events.PlayerQueryEventSource; +import mage.game.events.TableEvent; import mage.game.events.TableEvent.EventType; +import mage.game.events.TableEventSource; import mage.players.Player; import mage.players.PlayerList; diff --git a/Mage/src/main/java/mage/game/draft/DraftOptions.java b/Mage/src/main/java/mage/game/draft/DraftOptions.java index 88cafa94dfd..c052ef882b3 100644 --- a/Mage/src/main/java/mage/game/draft/DraftOptions.java +++ b/Mage/src/main/java/mage/game/draft/DraftOptions.java @@ -3,6 +3,7 @@ package mage.game.draft; import java.io.Serializable; + import mage.game.tournament.LimitedOptions; /** diff --git a/Mage/src/main/java/mage/game/draft/DraftPlayer.java b/Mage/src/main/java/mage/game/draft/DraftPlayer.java index 0c7c49ca5f8..72721da25c3 100644 --- a/Mage/src/main/java/mage/game/draft/DraftPlayer.java +++ b/Mage/src/main/java/mage/game/draft/DraftPlayer.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; + import mage.cards.Card; import mage.cards.decks.Deck; import mage.players.Player; diff --git a/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java b/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java index 3463363470f..04d53ef66d0 100644 --- a/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java @@ -3,9 +3,10 @@ package mage.game.draft; import java.util.ArrayList; -import java.util.List; -import mage.cards.ExpansionSet; import java.util.Collections; +import java.util.List; + +import mage.cards.ExpansionSet; /** * diff --git a/Mage/src/main/java/mage/game/draft/RateCard.java b/Mage/src/main/java/mage/game/draft/RateCard.java index d2d3608a850..14e734bdcdf 100644 --- a/Mage/src/main/java/mage/game/draft/RateCard.java +++ b/Mage/src/main/java/mage/game/draft/RateCard.java @@ -1,9 +1,26 @@ package mage.game.draft; +import java.io.InputStream; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Scanner; +import java.util.Set; + +import org.apache.log4j.Logger; + import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.*; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.effects.common.DamageWithPowerFromOneToAnotherTargetEffect; +import mage.abilities.effects.common.DamageWithPowerFromSourceToAnotherTargetEffect; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.abilities.effects.common.ExileTargetEffect; +import mage.abilities.effects.common.ExileUntilSourceLeavesEffect; +import mage.abilities.effects.common.FightTargetsEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.Card; @@ -14,10 +31,6 @@ import mage.constants.SubType; import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetPlayerOrPlaneswalker; -import org.apache.log4j.Logger; - -import java.io.InputStream; -import java.util.*; /** * Class responsible for reading ratings from resources and rating given cards. diff --git a/Mage/src/main/java/mage/game/draft/RichManBoosterDraft.java b/Mage/src/main/java/mage/game/draft/RichManBoosterDraft.java index da3fd7d8dab..ec8154bb32d 100644 --- a/Mage/src/main/java/mage/game/draft/RichManBoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/RichManBoosterDraft.java @@ -4,9 +4,11 @@ package mage.game.draft; import java.util.List; import java.util.Objects; import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.cards.Card; import mage.cards.ExpansionSet; -import org.apache.log4j.Logger; /** * diff --git a/Mage/src/main/java/mage/game/draft/RichManCubeBoosterDraft.java b/Mage/src/main/java/mage/game/draft/RichManCubeBoosterDraft.java index 082d82deb5f..0d74b28f995 100644 --- a/Mage/src/main/java/mage/game/draft/RichManCubeBoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/RichManCubeBoosterDraft.java @@ -1,7 +1,11 @@ package mage.game.draft; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; import mage.cards.Card; import mage.cards.ExpansionSet; diff --git a/Mage/src/main/java/mage/game/events/CoinFlippedEvent.java b/Mage/src/main/java/mage/game/events/CoinFlippedEvent.java index b7dad082256..c3a45f8e0fd 100644 --- a/Mage/src/main/java/mage/game/events/CoinFlippedEvent.java +++ b/Mage/src/main/java/mage/game/events/CoinFlippedEvent.java @@ -1,9 +1,9 @@ package mage.game.events; -import mage.util.CardUtil; - import java.util.UUID; +import mage.util.CardUtil; + /** * @author TheElk801 **/ diff --git a/Mage/src/main/java/mage/game/events/CostEvent.java b/Mage/src/main/java/mage/game/events/CostEvent.java index 75dee4fad26..38eba9e58d1 100644 --- a/Mage/src/main/java/mage/game/events/CostEvent.java +++ b/Mage/src/main/java/mage/game/events/CostEvent.java @@ -2,6 +2,7 @@ package mage.game.events; import java.util.UUID; + import mage.abilities.costs.Cost; /** diff --git a/Mage/src/main/java/mage/game/events/EntersTheBattlefieldEvent.java b/Mage/src/main/java/mage/game/events/EntersTheBattlefieldEvent.java index 3d7599a231a..2b8851c0d5f 100644 --- a/Mage/src/main/java/mage/game/events/EntersTheBattlefieldEvent.java +++ b/Mage/src/main/java/mage/game/events/EntersTheBattlefieldEvent.java @@ -2,8 +2,8 @@ package mage.game.events; import java.util.UUID; + import mage.constants.EnterEventType; -import static mage.constants.EnterEventType.SELF; import mage.constants.Zone; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/game/events/FlipCoinEvent.java b/Mage/src/main/java/mage/game/events/FlipCoinEvent.java index 3dc799ad4ec..a02a73af33b 100644 --- a/Mage/src/main/java/mage/game/events/FlipCoinEvent.java +++ b/Mage/src/main/java/mage/game/events/FlipCoinEvent.java @@ -1,9 +1,9 @@ package mage.game.events; -import mage.util.CardUtil; - import java.util.UUID; +import mage.util.CardUtil; + /** * @author TheElk801 **/ diff --git a/Mage/src/main/java/mage/game/events/GameEvent.java b/Mage/src/main/java/mage/game/events/GameEvent.java index fb854bcdf1c..65623d2860f 100644 --- a/Mage/src/main/java/mage/game/events/GameEvent.java +++ b/Mage/src/main/java/mage/game/events/GameEvent.java @@ -1,13 +1,13 @@ package mage.game.events; -import mage.MageObjectReference; -import mage.constants.Zone; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.UUID; +import mage.MageObjectReference; +import mage.constants.Zone; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/events/ManaEvent.java b/Mage/src/main/java/mage/game/events/ManaEvent.java index debf475c453..55eb73b4c34 100644 --- a/Mage/src/main/java/mage/game/events/ManaEvent.java +++ b/Mage/src/main/java/mage/game/events/ManaEvent.java @@ -3,6 +3,7 @@ package mage.game.events; import java.util.UUID; + import mage.Mana; /** diff --git a/Mage/src/main/java/mage/game/events/PlayerQueryEvent.java b/Mage/src/main/java/mage/game/events/PlayerQueryEvent.java index 508ce78bf05..6bb68e9b1fd 100644 --- a/Mage/src/main/java/mage/game/events/PlayerQueryEvent.java +++ b/Mage/src/main/java/mage/game/events/PlayerQueryEvent.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.TriggeredAbility; diff --git a/Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java b/Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java index 87dd6f45ec9..35159d93cd6 100644 --- a/Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java +++ b/Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.ActivatedAbility; import mage.abilities.TriggeredAbility; diff --git a/Mage/src/main/java/mage/game/events/TableEvent.java b/Mage/src/main/java/mage/game/events/TableEvent.java index 1d4cbefd633..d9bde63a38a 100644 --- a/Mage/src/main/java/mage/game/events/TableEvent.java +++ b/Mage/src/main/java/mage/game/events/TableEvent.java @@ -5,6 +5,7 @@ package mage.game.events; import java.io.Serializable; import java.util.EventObject; import java.util.UUID; + import mage.cards.Cards; import mage.cards.decks.Deck; import mage.game.Game; diff --git a/Mage/src/main/java/mage/game/events/TableEventSource.java b/Mage/src/main/java/mage/game/events/TableEventSource.java index 6c37e9badd5..bfc9fe6c6b8 100644 --- a/Mage/src/main/java/mage/game/events/TableEventSource.java +++ b/Mage/src/main/java/mage/game/events/TableEventSource.java @@ -2,17 +2,17 @@ package mage.game.events; +import java.io.Serializable; +import java.util.UUID; + import mage.cards.Cards; import mage.cards.decks.Deck; import mage.game.Game; import mage.game.draft.Draft; import mage.game.events.TableEvent.EventType; import mage.game.match.MatchOptions; -import mage.game.tournament.TournamentPairing; - -import java.io.Serializable; -import java.util.UUID; import mage.game.tournament.MultiplayerRound; +import mage.game.tournament.TournamentPairing; /** * diff --git a/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java b/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java index 90685321417..d33170ee3f8 100644 --- a/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java +++ b/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java @@ -2,6 +2,7 @@ package mage.game.events; import java.util.List; import java.util.UUID; + import mage.constants.Zone; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/game/events/ZoneChangeGroupEvent.java b/Mage/src/main/java/mage/game/events/ZoneChangeGroupEvent.java index 213f3a39d97..b3345b84631 100644 --- a/Mage/src/main/java/mage/game/events/ZoneChangeGroupEvent.java +++ b/Mage/src/main/java/mage/game/events/ZoneChangeGroupEvent.java @@ -1,12 +1,12 @@ package mage.game.events; +import java.util.Set; +import java.util.UUID; + import mage.cards.Card; import mage.constants.Zone; import mage.game.permanent.PermanentToken; -import java.util.Set; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/game/match/Match.java b/Mage/src/main/java/mage/game/match/Match.java index 0ab9150dd36..672f9820acd 100644 --- a/Mage/src/main/java/mage/game/match/Match.java +++ b/Mage/src/main/java/mage/game/match/Match.java @@ -4,6 +4,7 @@ package mage.game.match; import java.util.Date; import java.util.List; import java.util.UUID; + import mage.cards.decks.Deck; import mage.game.Game; import mage.game.GameException; diff --git a/Mage/src/main/java/mage/game/match/MatchImpl.java b/Mage/src/main/java/mage/game/match/MatchImpl.java index 668ef676705..6a1ca4ecf81 100644 --- a/Mage/src/main/java/mage/game/match/MatchImpl.java +++ b/Mage/src/main/java/mage/game/match/MatchImpl.java @@ -1,5 +1,13 @@ package mage.game.match; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.cards.decks.Deck; import mage.game.Game; import mage.game.GameException; @@ -13,9 +21,6 @@ import mage.game.result.ResultProtos.MatchQuitStatus; import mage.players.Player; import mage.util.DateFormat; import mage.util.RandomUtil; -import org.apache.log4j.Logger; - -import java.util.*; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/match/MatchOptions.java b/Mage/src/main/java/mage/game/match/MatchOptions.java index 0fd193193e3..fc1a7c44366 100644 --- a/Mage/src/main/java/mage/game/match/MatchOptions.java +++ b/Mage/src/main/java/mage/game/match/MatchOptions.java @@ -1,6 +1,12 @@ package mage.game.match; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import mage.constants.MatchTimeLimit; import mage.constants.MultiplayerAttackOption; import mage.constants.RangeOfInfluence; @@ -9,12 +15,6 @@ import mage.game.mulligan.MulliganType; import mage.game.result.ResultProtos; import mage.players.PlayerType; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/match/MatchPlayer.java b/Mage/src/main/java/mage/game/match/MatchPlayer.java index e7b876ceb64..166f34f6abf 100644 --- a/Mage/src/main/java/mage/game/match/MatchPlayer.java +++ b/Mage/src/main/java/mage/game/match/MatchPlayer.java @@ -1,12 +1,12 @@ package mage.game.match; +import java.io.Serializable; + import mage.cards.Card; import mage.cards.decks.Deck; import mage.cards.decks.DeckValidator; import mage.players.Player; -import java.io.Serializable; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/mulligan/CanadianHighlanderMulligan.java b/Mage/src/main/java/mage/game/mulligan/CanadianHighlanderMulligan.java index 320f39897c9..3e640fcd480 100644 --- a/Mage/src/main/java/mage/game/mulligan/CanadianHighlanderMulligan.java +++ b/Mage/src/main/java/mage/game/mulligan/CanadianHighlanderMulligan.java @@ -1,12 +1,12 @@ package mage.game.mulligan; -import mage.game.Game; -import mage.players.Player; - import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; +import mage.game.Game; +import mage.players.Player; + public class CanadianHighlanderMulligan extends VancouverMulligan { protected Map usedMulligans = new LinkedHashMap<>(); diff --git a/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java b/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java index aec6f4bc28b..cdc897f7d37 100644 --- a/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java +++ b/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java @@ -1,5 +1,9 @@ package mage.game.mulligan; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.Outcome; @@ -9,10 +13,6 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - public class LondonMulligan extends Mulligan { protected Map startingHandSizes = new HashMap<>(); diff --git a/Mage/src/main/java/mage/game/mulligan/Mulligan.java b/Mage/src/main/java/mage/game/mulligan/Mulligan.java index 43abf6c2840..05e07fae2ba 100644 --- a/Mage/src/main/java/mage/game/mulligan/Mulligan.java +++ b/Mage/src/main/java/mage/game/mulligan/Mulligan.java @@ -1,11 +1,15 @@ package mage.game.mulligan; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; -import java.util.*; - public abstract class Mulligan { protected final int freeMulligans; diff --git a/Mage/src/main/java/mage/game/mulligan/ParisMulligan.java b/Mage/src/main/java/mage/game/mulligan/ParisMulligan.java index 89ed63c087d..7f10ed7b0af 100644 --- a/Mage/src/main/java/mage/game/mulligan/ParisMulligan.java +++ b/Mage/src/main/java/mage/game/mulligan/ParisMulligan.java @@ -1,10 +1,10 @@ package mage.game.mulligan; +import java.util.UUID; + import mage.game.Game; import mage.players.Player; -import java.util.UUID; - public class ParisMulligan extends Mulligan { public ParisMulligan(int freeMulligans) { diff --git a/Mage/src/main/java/mage/game/mulligan/VancouverMulligan.java b/Mage/src/main/java/mage/game/mulligan/VancouverMulligan.java index 9a131224d9f..621f43c8275 100644 --- a/Mage/src/main/java/mage/game/mulligan/VancouverMulligan.java +++ b/Mage/src/main/java/mage/game/mulligan/VancouverMulligan.java @@ -1,10 +1,10 @@ package mage.game.mulligan; +import java.util.UUID; + import mage.game.Game; import mage.players.Player; -import java.util.UUID; - public class VancouverMulligan extends ParisMulligan { public VancouverMulligan(int freeMulligans) { diff --git a/Mage/src/main/java/mage/game/permanent/Battlefield.java b/Mage/src/main/java/mage/game/permanent/Battlefield.java index 6aacd3e45f8..0a0e1f62f55 100644 --- a/Mage/src/main/java/mage/game/permanent/Battlefield.java +++ b/Mage/src/main/java/mage/game/permanent/Battlefield.java @@ -1,9 +1,15 @@ package mage.game.permanent; import java.io.Serializable; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; + import mage.abilities.keyword.PhasingAbility; import mage.constants.CardType; import mage.constants.RangeOfInfluence; diff --git a/Mage/src/main/java/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java index 6102332e9ee..140372233c3 100644 --- a/Mage/src/main/java/mage/game/permanent/Permanent.java +++ b/Mage/src/main/java/mage/game/permanent/Permanent.java @@ -1,5 +1,9 @@ package mage.game.permanent; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; @@ -10,10 +14,6 @@ import mage.game.Controllable; import mage.game.Game; import mage.game.GameState; -import java.util.List; -import java.util.Set; -import java.util.UUID; - public interface Permanent extends Card, Controllable { void setControllerId(UUID controllerId); diff --git a/Mage/src/main/java/mage/game/permanent/PermanentCard.java b/Mage/src/main/java/mage/game/permanent/PermanentCard.java index bb387139e6e..52a2ccc5a89 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentCard.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentCard.java @@ -1,5 +1,7 @@ package mage.game.permanent; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -11,8 +13,6 @@ import mage.cards.LevelerCard; import mage.game.Game; import mage.game.events.ZoneChangeEvent; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index 7c20cb36c8f..bf6db4b4a32 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -1,5 +1,19 @@ package mage.game.permanent; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.MageObject; import mage.MageObjectReference; import mage.ObjectColor; @@ -12,11 +26,33 @@ import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.RestrictionEffect; import mage.abilities.hint.Hint; import mage.abilities.hint.HintUtils; -import mage.abilities.keyword.*; +import mage.abilities.keyword.BestowAbility; +import mage.abilities.keyword.DeathtouchAbility; +import mage.abilities.keyword.DefenderAbility; +import mage.abilities.keyword.HasteAbility; +import mage.abilities.keyword.HexproofAbility; +import mage.abilities.keyword.HexproofFromBlackAbility; +import mage.abilities.keyword.HexproofFromBlueAbility; +import mage.abilities.keyword.HexproofFromMonocoloredAbility; +import mage.abilities.keyword.HexproofFromWhiteAbility; +import mage.abilities.keyword.IndestructibleAbility; +import mage.abilities.keyword.InfectAbility; +import mage.abilities.keyword.LifelinkAbility; +import mage.abilities.keyword.MorphAbility; +import mage.abilities.keyword.ProtectionAbility; +import mage.abilities.keyword.ShroudAbility; +import mage.abilities.keyword.SquirrellinkAbility; +import mage.abilities.keyword.WitherAbility; import mage.abilities.text.TextPart; import mage.cards.Card; import mage.cards.CardImpl; -import mage.constants.*; +import mage.constants.AsThoughEffectType; +import mage.constants.EffectType; +import mage.constants.EmptyNames; +import mage.constants.EnterEventType; +import mage.constants.Rarity; +import mage.constants.SubType; +import mage.constants.Zone; import mage.counters.Counter; import mage.counters.CounterType; import mage.counters.Counters; @@ -26,10 +62,17 @@ import mage.game.ZoneChangeInfo; import mage.game.ZonesHandler; import mage.game.combat.CombatGroup; import mage.game.command.CommandObject; -import mage.game.events.*; +import mage.game.events.DamageCreatureEvent; +import mage.game.events.DamageEvent; +import mage.game.events.DamagePlaneswalkerEvent; +import mage.game.events.DamagedCreatureEvent; +import mage.game.events.DamagedPlaneswalkerEvent; +import mage.game.events.EntersTheBattlefieldEvent; +import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import mage.game.events.PreventDamageEvent; +import mage.game.events.ZoneChangeEvent; import mage.game.permanent.token.SquirrelToken; -import mage.game.permanent.token.Token; import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; @@ -37,10 +80,6 @@ import mage.target.TargetCard; import mage.util.CardUtil; import mage.util.GameLog; import mage.util.ThreadLocalStringBuilder; -import org.apache.log4j.Logger; - -import java.io.Serializable; -import java.util.*; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/permanent/PermanentMeld.java b/Mage/src/main/java/mage/game/permanent/PermanentMeld.java index 6b2728d1404..5479e4bac6d 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentMeld.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentMeld.java @@ -2,6 +2,7 @@ package mage.game.permanent; import java.util.UUID; + import mage.cards.Card; import mage.game.Game; diff --git a/Mage/src/main/java/mage/game/permanent/PermanentToken.java b/Mage/src/main/java/mage/game/permanent/PermanentToken.java index ba809c20565..215ebef25f7 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentToken.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentToken.java @@ -1,5 +1,7 @@ package mage.game.permanent; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; @@ -7,8 +9,6 @@ import mage.constants.EmptyNames; import mage.game.Game; import mage.game.permanent.token.Token; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java index f2d7c93246e..47dace338fb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java @@ -2,10 +2,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java b/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java index d8273083ec2..9671f284d77 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java @@ -2,10 +2,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java index a403149e9fe..51692d704f6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java @@ -3,10 +3,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java index d992ba44f4c..899d6c0591f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; +import java.util.Arrays; + import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java index 6715ee73f1c..660c58c63f6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java index 960758bc3d5..e7b294d3047 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java @@ -3,6 +3,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java index e6f0fc6fd9b..9d6841da4a6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java index 8dd5d9ee1df..b2a44d76025 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java index b611c880653..1d7b4d9b039 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java index fdb347b0cd7..c33d0364d09 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java index 5678ce5f7f0..c349167ca80 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java @@ -1,5 +1,10 @@ package mage.game.permanent.token; +import java.util.Collection; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; @@ -12,11 +17,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; -import java.util.Collection; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java index 5775db91f28..e234a46aa85 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java @@ -2,11 +2,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.LoseGameTargetPlayerEffect; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java index 9376200c6d8..34612b34ac9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java index cff99af782b..36b9e33f4e4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java @@ -3,14 +3,14 @@ package mage.game.permanent.token; import mage.abilities.Ability; -import mage.constants.CardType; -import mage.constants.SubType; import mage.abilities.common.SimpleStaticAbility; 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.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java b/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java index 157e31ef2f6..dcd035f8657 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java b/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java index 4f78ccd9af4..ed6188c1f1a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java index 6e22ffb8ce4..3cfaccdc0c9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -3,6 +3,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java index 7e7c7999dc8..9fffe8054d0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java index 50727e81da4..07fe444d6b9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java index f59cbc94a6d..7c83177b6bc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author LoneFox */ diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java index d6b579b4514..94db59e354f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java @@ -5,10 +5,6 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java index 10da78ae2da..51d81047626 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java index 61a0954317f..5752cab1a04 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -1,5 +1,9 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -17,10 +21,6 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.players.Player; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author LoneFox */ diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java index 6bb98201c18..be1d0ea60e2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java index 6360df3ff7d..10a115d403d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java index c73f04867b2..82a04ec978b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -3,6 +3,7 @@ package mage.game.permanent.token; import java.util.Arrays; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java index ecf7bb3cfa0..8a053f4442c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java b/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java index 0467ccce646..1388d95f6ea 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java index 688c6062382..b9da57366e9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java index 191101098ad..bf59176a763 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java b/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java index 7b070471262..a5ac6033400 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java b/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java index 5378a9fc143..0c11ff6d552 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java index 4ad88b0f3c7..983247ee3a5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java index 98e01857ffc..ba1641e74cf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken.java b/Mage/src/main/java/mage/game/permanent/token/CatToken.java index bfc82b39696..a5025d233d8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -5,6 +5,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java index 63b4f4c6dd6..2d3a2ecd6cb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -4,8 +4,9 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; + import mage.abilities.keyword.ForestwalkAbility; +import mage.constants.CardType; import mage.constants.SubType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java index 2af5a0e77f3..4e2369a18d7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java index ad357005716..a369b391452 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java @@ -4,9 +4,10 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java b/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java index f537c443bdd..a24337ceab6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java b/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java index ecf5ef1b3b9..b4ebe6b1e79 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.CanBlockOnlyFlyingAbility; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java index c9948238f5e..c1196fd295f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java @@ -1,6 +1,10 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -11,10 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * */ diff --git a/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java index a927019756f..d84403a0a62 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java b/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java index 204d6717dd2..abdeff4e1ee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.IslandwalkAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java index 9480897c735..d3d36a440b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java index b28fbe39445..81c951c7777 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java b/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java index 084cfebc5cd..c6727f31e19 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java index 5b12d51c573..e83cebd672c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java index a5314fa3465..2598b2b7a76 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java b/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java index 7e0359e6745..6e9e18b4cdb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/CurseOfTheSwineBoarToken.java b/Mage/src/main/java/mage/game/permanent/token/CurseOfTheSwineBoarToken.java index 373a82d8eb1..00dd64b6d96 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CurseOfTheSwineBoarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CurseOfTheSwineBoarToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java index ca72b9bfa0a..20dfdf83353 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java index b9ae698a311..0e005352de1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java @@ -1,17 +1,17 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; 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.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; diff --git a/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubToken.java b/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubToken.java index bb64e98d081..528ca70f6d3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.ShroudAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java index ffd6cb67596..fd5ef25ff9f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java @@ -1,8 +1,6 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -10,6 +8,8 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.NamePredicate; diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java index edbd8a30761..4d734267607 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java @@ -4,9 +4,10 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; + import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; import mage.constants.SubType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java index 8d3c7883fef..d76993efd92 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java index 9f494ab5cb7..88a02e0762a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java @@ -3,6 +3,7 @@ package mage.game.permanent.token; import java.util.Arrays; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java b/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java index c285dd8e8ce..1471b3cd173 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java index 775459ce188..68b5826ef3d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java index 44bfc7e8aa1..940ed6f228f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; import mage.constants.SubType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java index 5b4e48babb2..88431ef2ccd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java b/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java index 34776c6ec07..06b9d158ee0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java index 1fdaffe7b72..de193fc5295 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java b/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java index 73534848d8d..f14f6997fcd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java index 859a8e2be28..0018bf9a7fd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java @@ -7,8 +7,8 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java index babf74f8df8..8d7e1a67c04 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java index d6444d782d1..2e1291d2501 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author LoneFox */ diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java index 13d468195d3..7b8af98bc2c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java @@ -5,6 +5,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java index e603a6178f5..95043d879db 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java b/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java index 51799e349ab..df1ba5cbe5c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java index 467f16a0b35..51b7f1185ac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java @@ -4,9 +4,10 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java index da9a93e57f9..f6b043ed109 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.AnnihilatorAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java index 95f042f15be..b9d8910bc5d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java index c70ad886846..9ea3f3d6f09 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java index 13a993952c1..ab9b4fc69d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java index 88637b7b67d..3ca27b7ea25 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java index 5369b5bff61..990403509eb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java @@ -5,6 +5,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java index 686a443bcc1..cf5941c2601 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java index 71ae36fa8be..8193a0b670c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java index baad518b72d..8b2b311ee96 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java b/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java index ff472627b30..df3b684982e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java @@ -1,12 +1,12 @@ package mage.game.permanent.token; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.mana.AddManaOfAnyColorEffect; import mage.abilities.mana.SimpleManaAbility; +import mage.constants.CardType; import mage.constants.Zone; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/ExpansionSymbolToken.java b/Mage/src/main/java/mage/game/permanent/token/ExpansionSymbolToken.java index 1f608901ce2..7958b367480 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ExpansionSymbolToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ExpansionSymbolToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java index 76ea60a0094..a1aa9313ec8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java index a5b324e663e..b834ae851dc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java index fa5a9797d57..9e8a3b632a7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java index b826239e56f..dfb053ce95d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java b/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java index a4d6f1da0a8..97aa99639bb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/FoodToken.java b/Mage/src/main/java/mage/game/permanent/token/FoodToken.java index 9cc5e12305a..4ac9a55b18a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FoodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FoodToken.java @@ -1,5 +1,9 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -11,10 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author jmharmon */ diff --git a/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java index a49e7343db8..3cfb7404f4d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java index 2f2c3b25ed6..5541a7c79e4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java @@ -4,11 +4,12 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.ObjectColor; import mage.abilities.mana.GreenManaAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/FrogToken.java b/Mage/src/main/java/mage/game/permanent/token/FrogToken.java index 1dd66a20ae2..0ca1b134c32 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FrogToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FrogToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java index 29e4b21c93d..8b60b62fbca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java index 5d1f182654a..1aa559f68f7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GermToken.java b/Mage/src/main/java/mage/game/permanent/token/GermToken.java index 7b8ed218af0..8b511c84700 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GermToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GermToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java index 395e126aaaa..00c6bafb9ea 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantToken.java index f33b82b956f..ad6fa12941f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java index 03da6d74867..d9a52cd8357 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java b/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java index b3461e2edf8..e18d9b521f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java index 5f286483afd..894ed756912 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author LoneFox */ diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java index 1936a727885..40453abb42a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java @@ -3,9 +3,10 @@ package mage.game.permanent.token; import java.util.Arrays; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java index 5ac834a92e1..070f93fddb3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.MountainwalkAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java index 8682237b611..fded4c7d090 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java index da279757c1b..fdcd702d999 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author North */ diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java index 94b1e50c952..268ea791c79 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java index 2a1a0007f27..be7aab51aa5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java index 04764f2c584..9c9eb6e556e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java index 9f82f171dca..88a3f057d6f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java @@ -1,15 +1,15 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.mana.AnyColorManaAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java index 14dcc4203eb..684decd8203 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; 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.TapTargetEffect; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java index 8acd4b64121..fb23c60fc1a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author North */ diff --git a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java index 5d59a2248e4..97e2f6a3302 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java index 51ffa57bbd9..8915c4ea0f4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + public final class GrismoldPlantToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java index 424cf239d9e..a8e569b50cf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java index 626f4a26741..3eb5e3a852d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java index a6997c2f4b4..a0171255350 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java @@ -2,15 +2,16 @@ package mage.game.permanent.token; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; diff --git a/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java index 3420af70a82..4e9f5d2e651 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java index b03ced80b06..2bd272d8828 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java b/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java index f22622473f9..146a235384b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java index 83aff50e61d..d69eafaff53 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HornetNestInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/HornetNestInsectToken.java index b3b3344c72b..5f390f0e501 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HornetNestInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HornetNestInsectToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HornetQueenInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/HornetQueenInsectToken.java index 91fea8b5ef7..953866fc853 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HornetQueenInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HornetQueenInsectToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java index b66c85ae3a8..f8c75126ad1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HoundToken.java b/Mage/src/main/java/mage/game/permanent/token/HoundToken.java index a20c160fc10..40a7ee25325 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HoundToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HoundToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java b/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java index c4b68063859..292a1f85ab4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java index e57bcd4fc1f..e6eb92f24e8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java index 79f039152e0..b01e9ae857f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; +import java.util.Arrays; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author LoneFox */ diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java index 63fbd6c7930..2072c561c32 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java @@ -4,11 +4,12 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java index f0751efe801..551e6d5da8e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java @@ -3,6 +3,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.abilities.keyword.FirstStrikeAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java b/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java index 5dace1e2543..b0f275c4134 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java index 0a1aa382d26..66edd4c6b0b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java @@ -1,8 +1,8 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java index e69fa6de419..e1f96e4f90c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java index 7992ed37368..3a73cd76f97 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java @@ -2,10 +2,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.InfectAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java index 8b2fa6e4bf0..e1875d7fa82 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java @@ -5,6 +5,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java index 2395dc2ebc5..7a3d29a7646 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java index 6b7f5a3e1b1..fcdc8f13aaa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java index d4dd3a6c8ab..47457591b58 100644 --- a/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java @@ -1,12 +1,12 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.SacrificeSourceEffect; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java index 36321493efa..9ad5a3c2afa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/KaldraToken.java b/Mage/src/main/java/mage/game/permanent/token/KaldraToken.java index 3b420527c66..6b7d992b590 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KaldraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KaldraToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; import mage.constants.SuperType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java index 1f7c8b98573..ba4b22a8e43 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java index de4d9be1e25..a2608ecbf16 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -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.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index 842cc6d7da1..5db676e9349 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -1,5 +1,9 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -11,10 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java index cb6a9896847..fb554088bd5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/KelpToken.java b/Mage/src/main/java/mage/game/permanent/token/KelpToken.java index 7dfa0862a80..e2ef065be13 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KelpToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KelpToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java index 9a247da94ea..01f0941ea34 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/KioraKrakenToken.java b/Mage/src/main/java/mage/game/permanent/token/KioraKrakenToken.java index e4e02e23bc1..0af2ec4a1e8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KioraKrakenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KioraKrakenToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java index f07a27b4d79..94d67d1aab7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java @@ -1,6 +1,7 @@ package mage.game.permanent.token; import java.util.Arrays; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java index 70e6ae380fd..4aed2eb194f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index 35f63cd23b7..36031f9a090 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -1,15 +1,15 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java index b3378c99495..3cda9ebaace 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java @@ -3,9 +3,10 @@ package mage.game.permanent.token; import java.util.Arrays; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java b/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java index 99135f47104..a05109fb972 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.Predicates; diff --git a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java index 69cc8040abc..dfcaac78a18 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java @@ -4,10 +4,11 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java index aa2c7d53bb2..faa80ed8147 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java index d9397da5981..5b5fa2dbd6a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/LizardToken.java b/Mage/src/main/java/mage/game/permanent/token/LizardToken.java index 47773e5e40b..7545eb88d1c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LizardToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java b/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java index ed4dff01d65..75b584d21b4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java index 200f68b756b..24a6b4847c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java index 7a4dc7adaff..058bd76d770 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java index 67cbafef84f..8e37d0e4b25 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java @@ -1,5 +1,7 @@ package mage.game.permanent.token; +import java.util.Arrays; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; @@ -7,8 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import java.util.Arrays; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java index 533b8000568..6e31471efe1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java b/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java index c8837d51dcf..035e80488da 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java @@ -1,12 +1,12 @@ package mage.game.permanent.token; +import java.util.Arrays; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java b/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java index f066130b9be..6291d534e17 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java index 37a366a5e70..a92627fdb09 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java index 79513b0de14..2859d043c98 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; import mage.util.RandomUtil; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/MinorDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/MinorDemonToken.java index 88592990f9d..ee11e4e090d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinorDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinorDemonToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java index 9a35537d5e5..6e60c664079 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.ProwessAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java index a1914b0c904..89bb3ac2314 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + public final class MyrToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java index 20523f5204b..fb09b6bb53a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java index e479adff3c0..3f47d499627 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java @@ -1,8 +1,6 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -12,8 +10,10 @@ import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.constants.AttachmentType; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java index 02c764c2eda..e4281eed899 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java b/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java index 800fc02f5d5..5c39d64c21f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; diff --git a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java index bd0082403b9..f238d3d0f88 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java b/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java index 0b7ea29d4e7..d018c77923f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java index 87767529a59..065820fc88b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java index 5eb1c790a24..c6d081d3a96 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieToken.java b/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieToken.java index e2cfd72053c..04c4775a8d9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java index 42736bec1ea..f1ac305fdff 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java index a3b3f578363..d993fa0debf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java index 383605fd5c5..96089670222 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; import mage.filter.common.FilterControlledCreaturePermanent; import mage.util.RandomUtil; diff --git a/Mage/src/main/java/mage/game/permanent/token/OwlToken.java b/Mage/src/main/java/mage/game/permanent/token/OwlToken.java index 027eb9edecb..8fff45fd4ff 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OwlToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OwlToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java index f554901c28d..c8c53fa2e5e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java index 332b0d1cbe8..71f364f07c3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java @@ -2,10 +2,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java index 2d24d3e34b4..a1100b1e34f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java index 7a73e237654..e85182f9502 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java index b6efaf716a8..7ce4ae2b02e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java index 80340d7db29..4a99b4803f7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.ReachAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java index e42e1834df7..ecff13cb4fc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PestToken.java b/Mage/src/main/java/mage/game/permanent/token/PestToken.java index 2aca577ddad..f823fec48af 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PestToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PestToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java index 4b775da2148..3a8c278b7f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.abilities.keyword.DeathtouchAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.abilities.keyword.DeathtouchAbility; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java index 9d1bf07eb68..8eec1206dac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PincherToken.java b/Mage/src/main/java/mage/game/permanent/token/PincherToken.java index 8fe8ebf6a2c..658382bbd09 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PincherToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PincherToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PirateToken.java b/Mage/src/main/java/mage/game/permanent/token/PirateToken.java index 545bc43402c..7b8004f4856 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PirateToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PirateToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.MenaceAbility; +import mage.constants.CardType; import mage.constants.SubType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java index 962b0c657ae..aba1a420d0b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java @@ -5,6 +5,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java index 377fbc706a8..000c2bed83d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/PorgToken.java b/Mage/src/main/java/mage/game/permanent/token/PorgToken.java index fc09a8c7a53..bc1179be78b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PorgToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PorgToken.java @@ -2,13 +2,13 @@ package mage.game.permanent.token; +import java.util.Collections; + import mage.MageInt; import mage.abilities.keyword.MonstrosityAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Collections; - /** * * @author NinthWorld diff --git a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java index 8f0336ee67f..23fb5240f19 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/PromiseOfPowerDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/PromiseOfPowerDemonToken.java index aa84af908c9..9dc8f071fb8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PromiseOfPowerDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PromiseOfPowerDemonToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ProsshKoboldToken.java b/Mage/src/main/java/mage/game/permanent/token/ProsshKoboldToken.java index bc4861d688e..4f3ac141dcb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ProsshKoboldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ProsshKoboldToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java index 1afa17bd771..7b3993fb726 100644 --- a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RabidSheepToken.java b/Mage/src/main/java/mage/game/permanent/token/RabidSheepToken.java index e3912f9f2b1..8077bf2606e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RabidSheepToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RabidSheepToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java index 51ebd774da6..dd5c1424e85 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java index bbc2c3efb63..690e3f3b154 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RatToken.java b/Mage/src/main/java/mage/game/permanent/token/RatToken.java index 9cf4c9b9fc5..787c2ada141 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RatToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java index b1385767645..c37cc3ada2f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.abilities.keyword.SpaceflightAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.abilities.keyword.SpaceflightAbility; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java index 6c72f06f392..b1144e9ffdc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.ObjectColor; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java index 1ac90fc567c..285e54f46fa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormKrakenToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormKrakenToken.java index 8b13e13b181..943420460fc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormKrakenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormKrakenToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java index 634a8a8b593..c40e2aba99f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java index f77b3997040..f10591caf1c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java index 3b268d15ca1..ea9782188a1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ReignOfThePitToken.java b/Mage/src/main/java/mage/game/permanent/token/ReignOfThePitToken.java index a669ea004fe..4aec4d8fa3b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReignOfThePitToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReignOfThePitToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java index 4fc671fca7b..a344ea342f9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.ReachAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RetrofitterFoundryToken.java b/Mage/src/main/java/mage/game/permanent/token/RetrofitterFoundryToken.java index c413d20bcac..93882049c96 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RetrofitterFoundryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RetrofitterFoundryToken.java @@ -1,8 +1,8 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java index 3c08fd7f262..5bbeeea3b91 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java @@ -1,12 +1,12 @@ package mage.game.permanent.token; +import java.util.Arrays; + import mage.MageInt; import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java b/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java index 85a13db68a8..9c30d642b6b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java b/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java index bef552a52e4..119a2e3c91f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java index 59b2e3cb2d6..03af6674944 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlankingAbility; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.ProtectionAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java b/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java index ab70e8e24a3..586eb2d4d7e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; +import mage.constants.CardType; import mage.constants.SubType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java index c2e699b2f67..7b36c9c999e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java index dfe2f6c89c8..69778926a6b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java index 4bd15467301..398a29a990d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java b/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java index d26a118b308..2b116bee1ef 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.abilities.keyword.FirstStrikeAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.abilities.keyword.FirstStrikeAbility; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java index e0416e121cd..137f4b298de 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java @@ -2,15 +2,15 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java index 828a2545d88..e678530d37f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java index 201ea26aeec..63ecf6bd44d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java b/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java index fd049a066ac..1bfd47b8231 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java index 3af7624285c..1e17465b528 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java @@ -2,8 +2,7 @@ package mage.game.permanent.token; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -12,7 +11,9 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; diff --git a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java index a4f9e5967d7..1a5d1ecb759 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java index 43fc61957d4..fb9c11d0a35 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java index 7f5d05ce522..aa8efb4dbcb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.keyword.ChangelingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java index 4f267bdf721..d10f65bb290 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java @@ -5,8 +5,8 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.ColoredManaSymbol; +import mage.constants.SubType; import mage.constants.Zone; public final class SkeletonToken extends TokenImpl { diff --git a/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java b/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java index 743fe20171e..2296420218f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java index a35648a22c7..98c475084e2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java @@ -3,9 +3,10 @@ package mage.game.permanent.token; import java.util.Arrays; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SliversmithToken.java b/Mage/src/main/java/mage/game/permanent/token/SliversmithToken.java index 868a8f5e2f1..8a790a63bbf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SliversmithToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SliversmithToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java index 2b7069db4e4..8707c1dcf09 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java index 6275b24333e..6c234642486 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java index 59fe7b1231c..4c7b210e53f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -5,10 +5,11 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java index 9e81cc4e87b..574347bf682 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java index bde1506ce58..43a3357d690 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java index 77c4b6aa63e..3eccb60bbd7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; import mage.abilities.effects.common.continuous.BoostSourceEffect; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; diff --git a/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java index 29b6b565e29..8162686bcae 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java index 5ad16fb45fb..e2199b1d884 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java b/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java index f81e52f44b9..25a348a701c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java index 6c5dd0e72fb..bf23b5100e5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.keyword.ReachAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author fireshoes */ diff --git a/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java b/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java index 3c9a24cefc6..af271353e46 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java index 6cd7374debe..1414da64454 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java index 7f64cfe9208..4f2dd977521 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author Loki */ diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java index bfcf62c0112..f1180278348 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/game/permanent/token/SplinterToken.java b/Mage/src/main/java/mage/game/permanent/token/SplinterToken.java index bc5bfdcbca8..4d4e9971641 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SplinterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SplinterToken.java @@ -1,12 +1,12 @@ package mage.game.permanent.token; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; +import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java index e49b5949ad9..2a768ca5d85 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java index da3cb49d28b..31d9af6cbcc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.AttacksIfAbleAllEffect; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java index f3db928d7a3..1ce50dc9fc1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author North */ diff --git a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java index e0c941c1b48..5ee8d1779dd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; import mage.constants.SuperType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java index bff1d69f124..0bae620e38c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java index fa83cda6dfc..245403ac575 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java index bad943aa929..836010bf89b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/StormCrowToken.java b/Mage/src/main/java/mage/game/permanent/token/StormCrowToken.java index 115777d6387..4145cd43317 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StormCrowToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StormCrowToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java b/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java index e5624079b53..0211bb69644 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java index a2c8fe91a49..1371200be53 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java b/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java index 73077e75888..6330d666b4f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java index 35221bece39..ea8eead8602 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java index 8fb2edb7950..3971c23d574 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java index 596d9d86953..abfce203372 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java @@ -5,7 +5,11 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlyingAbility; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.SubType; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java index 439d6ba8975..5f5256d638f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; +import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; -import mage.abilities.keyword.HasteAbility; -import mage.abilities.keyword.FlyingAbility; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java index d2a6c00ffdb..3c9fb6c3dfd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java @@ -4,6 +4,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java index f422785dc96..93ccff3a47e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java index a417cea7211..539d46990a3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java @@ -5,6 +5,7 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java index 39d242a8ce5..cc58979ae3c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java index 70bfd582cb2..91370d3e24a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java index 38bd95ccd73..5ea953638c8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java @@ -4,10 +4,11 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.ObjectColor; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java index 95a4a88ce81..5f7affc5175 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Token.java @@ -1,12 +1,13 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.cards.Card; import mage.game.Game; -import java.util.ArrayList; -import java.util.UUID; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java index 222b063c816..24ada6653e2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java +++ b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java @@ -1,5 +1,10 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.UUID; + import mage.MageObject; import mage.MageObjectImpl; import mage.abilities.Ability; @@ -14,11 +19,6 @@ import mage.game.permanent.PermanentToken; import mage.players.Player; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.UUID; - public abstract class TokenImpl extends MageObjectImpl implements Token { protected String description; diff --git a/Mage/src/main/java/mage/game/permanent/token/TombspawnZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/TombspawnZombieToken.java index 069ba44f0e5..2427b1ed48f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TombspawnZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TombspawnZombieToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java index dd23d59eda2..e9a97ad9a1b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java @@ -1,5 +1,9 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -9,10 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java index 33a14db3c5a..5f2404234ca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java index d8f28e061b9..263bae2e191 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetAnyTarget; diff --git a/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java b/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java index b4dc4df3c1e..c5ff24a7557 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; import mage.constants.SuperType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/UktabiKongApeToken.java b/Mage/src/main/java/mage/game/permanent/token/UktabiKongApeToken.java index 8fb6538aaf0..3e721aa0adf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UktabiKongApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UktabiKongApeToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/UramiToken.java b/Mage/src/main/java/mage/game/permanent/token/UramiToken.java index 22979f03c56..80b20af116b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UramiToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UramiToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java index 98bedc8bf69..6c86d4e951a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -4,10 +4,11 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java index 9b10f6d21dc..5b9fdc0974f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java @@ -4,11 +4,12 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java index c0acb79c8f4..758d878d498 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java index dd9bb168cf6..d2ff9a8a08d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/VojaToken.java b/Mage/src/main/java/mage/game/permanent/token/VojaToken.java index 5de31bfe826..49baed4acd1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VojaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VojaToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; import mage.constants.SuperType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java b/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java index 77dffa3e24a..4b686985a93 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; -import mage.constants.CardType; import mage.MageInt; import mage.ObjectColor; +import mage.constants.CardType; import mage.constants.SubType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java b/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java index b07977696fd..a69e7bcb707 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WallToken.java b/Mage/src/main/java/mage/game/permanent/token/WallToken.java index d1fdcf21fe8..57daa485da0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WallToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java index 77dc8c07af9..d9147c4492a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java @@ -4,10 +4,11 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WaspToken.java b/Mage/src/main/java/mage/game/permanent/token/WaspToken.java index e4580a6e0f5..9cd8a5e8d81 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaspToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaspToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java b/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java index 67c49089b88..4baef06c263 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java index fcec46692ad..d2b2134ed8e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java @@ -1,11 +1,11 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java index 4b7e87aaf44..c71a18a7ee0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java @@ -1,12 +1,12 @@ package mage.game.permanent.token; +import java.util.Arrays; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -import java.util.Arrays; - /** * @author spjspj */ diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java index 52edc3276e2..fff4f8fc69e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java index 0bc2872f8b9..1ecf50e386e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java b/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java index 907ea24ad0b..8899538651f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java @@ -1,8 +1,8 @@ package mage.game.permanent.token; -import mage.constants.CardType; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; import mage.constants.SubType; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java index 95eb587e00c..ebd4aae93a6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -1,13 +1,13 @@ package mage.game.permanent.token; -import mage.MageInt; -import mage.constants.CardType; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import mage.MageInt; +import mage.constants.CardType; +import mage.constants.SubType; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java index 25858e1b725..f59fc4a7d2d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java @@ -2,10 +2,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WolvesOfTheHuntToken.java b/Mage/src/main/java/mage/game/permanent/token/WolvesOfTheHuntToken.java index af156cd597b..c00d0c32905 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolvesOfTheHuntToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolvesOfTheHuntToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.BandsWithOtherAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WoodToken.java b/Mage/src/main/java/mage/game/permanent/token/WoodToken.java index 21f493d197b..8a0bba091cd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WoodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WoodToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DefenderAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java b/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java index f1d333c7614..1734f9ca4bf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WortTheRaidmotherToken.java b/Mage/src/main/java/mage/game/permanent/token/WortTheRaidmotherToken.java index b59b6445800..5245974c031 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WortTheRaidmotherToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WortTheRaidmotherToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java index 85d01168269..488f17ec756 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java index 7b313746d8c..a8c58fea48d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java index 598e85a5a40..0e8dd137c2d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java @@ -5,10 +5,11 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.TrampleAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java index 31425bb2bdb..9ea8f44c36a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java @@ -5,9 +5,10 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java index a988c885da5..1e7c2e74ef2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java @@ -1,10 +1,10 @@ package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java index a17aa4a0070..a6034dbb5c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java @@ -1,9 +1,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java index 4927f61524c..bce656d4e65 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java @@ -4,8 +4,8 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import mage.MageInt; -import mage.ObjectColor; import mage.abilities.keyword.MenaceAbility; import mage.constants.CardType; import mage.constants.SubType; diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java index 05187032686..105f734cbf9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -1,14 +1,14 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; import mage.util.RandomUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java index d4d701f5d72..8cfa2d82577 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java @@ -2,9 +2,9 @@ package mage.game.permanent.token; +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/custom/ElementalCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/custom/ElementalCreatureToken.java index 46d3414cb08..f2f3b566132 100644 --- a/Mage/src/main/java/mage/game/permanent/token/custom/ElementalCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/custom/ElementalCreatureToken.java @@ -5,7 +5,6 @@ import mage.ObjectColor; import mage.constants.CardType; import mage.constants.SubType; import mage.game.permanent.token.TokenImpl; -import mage.util.SubTypeList; /** * diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java index 3c29624c2e6..a18d2c87848 100644 --- a/Mage/src/main/java/mage/game/stack/Spell.java +++ b/Mage/src/main/java/mage/game/stack/Spell.java @@ -1,6 +1,11 @@ package mage.game.stack; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.MageInt; import mage.MageObject; import mage.Mana; @@ -16,8 +21,20 @@ import mage.abilities.costs.mana.ManaCosts; import mage.abilities.keyword.BestowAbility; import mage.abilities.keyword.MorphAbility; import mage.abilities.text.TextPart; -import mage.cards.*; -import mage.constants.*; +import mage.cards.AdventureCard; +import mage.cards.AdventureCardSpell; +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.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; +import mage.constants.ZoneDetail; import mage.counters.Counter; import mage.counters.Counters; import mage.filter.FilterMana; diff --git a/Mage/src/main/java/mage/game/stack/SpellStack.java b/Mage/src/main/java/mage/game/stack/SpellStack.java index 40b5c963883..bd84af0249f 100644 --- a/Mage/src/main/java/mage/game/stack/SpellStack.java +++ b/Mage/src/main/java/mage/game/stack/SpellStack.java @@ -4,12 +4,14 @@ package mage.game.stack; import java.util.ArrayDeque; import java.util.Date; import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.MageObject; import mage.constants.Zone; import mage.constants.ZoneDetail; import mage.game.Game; import mage.game.events.GameEvent; -import org.apache.log4j.Logger; /** * diff --git a/Mage/src/main/java/mage/game/stack/StackAbility.java b/Mage/src/main/java/mage/game/stack/StackAbility.java index bd37c6436fa..4a9ecaa31b0 100644 --- a/Mage/src/main/java/mage/game/stack/StackAbility.java +++ b/Mage/src/main/java/mage/game/stack/StackAbility.java @@ -1,9 +1,20 @@ package mage.game.stack; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.UUID; + import mage.MageInt; import mage.MageObject; import mage.ObjectColor; -import mage.abilities.*; +import mage.abilities.Abilities; +import mage.abilities.AbilitiesImpl; +import mage.abilities.Ability; +import mage.abilities.MageSingleton; +import mage.abilities.Mode; +import mage.abilities.Modes; +import mage.abilities.StateTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.CostAdjuster; import mage.abilities.costs.Costs; @@ -17,7 +28,15 @@ import mage.abilities.hint.Hint; import mage.abilities.text.TextPart; import mage.cards.Card; import mage.cards.FrameStyle; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.AbilityWord; +import mage.constants.CardType; +import mage.constants.EffectType; +import mage.constants.Outcome; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.constants.Zone; +import mage.constants.ZoneDetail; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -30,11 +49,6 @@ import mage.util.GameLog; import mage.util.SubTypeList; import mage.watchers.Watcher; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/stack/StackObjImpl.java b/Mage/src/main/java/mage/game/stack/StackObjImpl.java index 6b38b76acbc..3168eed4b15 100644 --- a/Mage/src/main/java/mage/game/stack/StackObjImpl.java +++ b/Mage/src/main/java/mage/game/stack/StackObjImpl.java @@ -1,5 +1,8 @@ package mage.game.stack; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; @@ -14,9 +17,6 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetAmount; -import java.util.Set; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/game/stack/StackObject.java b/Mage/src/main/java/mage/game/stack/StackObject.java index 9a51ed2d4d6..08e166992da 100644 --- a/Mage/src/main/java/mage/game/stack/StackObject.java +++ b/Mage/src/main/java/mage/game/stack/StackObject.java @@ -2,6 +2,7 @@ package mage.game.stack; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/game/tournament/LimitedOptions.java b/Mage/src/main/java/mage/game/tournament/LimitedOptions.java index 0151beed800..848d7185f24 100644 --- a/Mage/src/main/java/mage/game/tournament/LimitedOptions.java +++ b/Mage/src/main/java/mage/game/tournament/LimitedOptions.java @@ -1,12 +1,12 @@ package mage.game.tournament; -import mage.cards.decks.Deck; -import mage.game.draft.DraftCube; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import mage.cards.decks.Deck; +import mage.game.draft.DraftCube; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/tournament/MultiplayerRound.java b/Mage/src/main/java/mage/game/tournament/MultiplayerRound.java index 6c9ba9f0b78..bacd81c5ec8 100644 --- a/Mage/src/main/java/mage/game/tournament/MultiplayerRound.java +++ b/Mage/src/main/java/mage/game/tournament/MultiplayerRound.java @@ -5,6 +5,7 @@ package mage.game.tournament; import java.util.ArrayList; import java.util.List; import java.util.UUID; + import mage.game.match.Match; /** diff --git a/Mage/src/main/java/mage/game/tournament/Tournament.java b/Mage/src/main/java/mage/game/tournament/Tournament.java index a296709b791..688459d446b 100644 --- a/Mage/src/main/java/mage/game/tournament/Tournament.java +++ b/Mage/src/main/java/mage/game/tournament/Tournament.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; import java.util.UUID; + import mage.cards.ExpansionSet; import mage.cards.decks.Deck; import mage.game.draft.Draft; diff --git a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java index 3d1bfe73ed1..9c3e28ec59e 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java @@ -1,15 +1,30 @@ package mage.game.tournament; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.CopyOnWriteArrayList; + +import org.apache.log4j.Logger; + import mage.cards.ExpansionSet; import mage.cards.decks.Deck; import mage.constants.TournamentPlayerState; import mage.game.draft.Draft; import mage.game.draft.DraftCube; -import mage.game.events.*; +import mage.game.events.Listener; +import mage.game.events.PlayerQueryEvent; +import mage.game.events.PlayerQueryEventSource; +import mage.game.events.TableEvent; import mage.game.events.TableEvent.EventType; +import mage.game.events.TableEventSource; import mage.game.match.Match; import mage.game.match.MatchPlayer; import mage.game.result.ResultProtos.MatchPlayerProto; @@ -20,7 +35,6 @@ import mage.game.result.ResultProtos.TourneyRoundProto; import mage.players.Player; import mage.players.PlayerType; import mage.util.RandomUtil; -import org.apache.log4j.Logger; /** * diff --git a/Mage/src/main/java/mage/game/tournament/TournamentOptions.java b/Mage/src/main/java/mage/game/tournament/TournamentOptions.java index c81294ce3ee..50136a52856 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentOptions.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentOptions.java @@ -1,13 +1,13 @@ package mage.game.tournament; -import mage.game.match.MatchOptions; -import mage.players.PlayerType; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import mage.game.match.MatchOptions; +import mage.players.PlayerType; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/tournament/TournamentPairing.java b/Mage/src/main/java/mage/game/tournament/TournamentPairing.java index 3939ce40f0c..a891007e1b6 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentPairing.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentPairing.java @@ -3,6 +3,7 @@ package mage.game.tournament; import java.util.UUID; + import mage.constants.TournamentPlayerState; import mage.game.match.Match; import mage.game.match.MatchPlayer; diff --git a/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java b/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java index 18b063822b9..236109935c7 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java @@ -1,5 +1,7 @@ package mage.game.tournament; +import java.util.Set; + import mage.cards.decks.Deck; import mage.constants.TournamentPlayerState; import mage.game.result.ResultProtos.TourneyPlayerProto; @@ -8,8 +10,6 @@ import mage.players.Player; import mage.players.PlayerType; import mage.util.TournamentUtil; -import java.util.Set; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java b/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java index 8d366a2136c..e03b63a4a9e 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java @@ -4,6 +4,7 @@ package mage.game.tournament; import java.util.Map; import java.util.UUID; + import mage.constants.MultiplayerAttackOption; import mage.game.events.TableEvent; diff --git a/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java b/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java index 714305a73af..68c5e7264a3 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java @@ -4,8 +4,8 @@ package mage.game.tournament; import java.util.List; import java.util.Map.Entry; import java.util.UUID; -import mage.constants.MultiplayerAttackOption; +import mage.constants.MultiplayerAttackOption; import mage.constants.TournamentPlayerState; import mage.game.events.TableEvent; import mage.game.tournament.pairing.RoundPairings; diff --git a/Mage/src/main/java/mage/game/tournament/pairing/RoundPairings.java b/Mage/src/main/java/mage/game/tournament/pairing/RoundPairings.java index f326717453f..96663bb7cb3 100644 --- a/Mage/src/main/java/mage/game/tournament/pairing/RoundPairings.java +++ b/Mage/src/main/java/mage/game/tournament/pairing/RoundPairings.java @@ -2,12 +2,12 @@ package mage.game.tournament.pairing; -import mage.game.tournament.TournamentPairing; -import mage.game.tournament.TournamentPlayer; - import java.util.ArrayList; import java.util.List; +import mage.game.tournament.TournamentPairing; +import mage.game.tournament.TournamentPlayer; + /** * * @author Quercitron diff --git a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java index 4be6d8f9fff..9129616f35b 100644 --- a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java +++ b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java @@ -2,12 +2,17 @@ package mage.game.tournament.pairing; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import mage.game.tournament.Round; import mage.game.tournament.TournamentPairing; import mage.game.tournament.TournamentPlayer; -import java.util.*; - /** * @author Quercitron */ diff --git a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java index 1b4572364b7..96a921ea643 100644 --- a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java +++ b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java @@ -2,13 +2,13 @@ package mage.game.tournament.pairing; +import java.util.ArrayList; +import java.util.List; + import mage.game.tournament.Round; import mage.game.tournament.TournamentPairing; import mage.game.tournament.TournamentPlayer; -import java.util.ArrayList; -import java.util.List; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/turn/BeginCombatStep.java b/Mage/src/main/java/mage/game/turn/BeginCombatStep.java index 17f5a0edda8..5edc98660a8 100644 --- a/Mage/src/main/java/mage/game/turn/BeginCombatStep.java +++ b/Mage/src/main/java/mage/game/turn/BeginCombatStep.java @@ -3,6 +3,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/game/turn/BeginningPhase.java b/Mage/src/main/java/mage/game/turn/BeginningPhase.java index b4cd6a7a4d6..b46efcb5ec8 100644 --- a/Mage/src/main/java/mage/game/turn/BeginningPhase.java +++ b/Mage/src/main/java/mage/game/turn/BeginningPhase.java @@ -3,6 +3,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.TurnPhase; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/game/turn/CleanupStep.java b/Mage/src/main/java/mage/game/turn/CleanupStep.java index efe7e7596c5..e504a3a8de0 100644 --- a/Mage/src/main/java/mage/game/turn/CleanupStep.java +++ b/Mage/src/main/java/mage/game/turn/CleanupStep.java @@ -3,6 +3,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/game/turn/CombatDamageStep.java b/Mage/src/main/java/mage/game/turn/CombatDamageStep.java index 823c6a2aa0f..8c1105c2d35 100644 --- a/Mage/src/main/java/mage/game/turn/CombatDamageStep.java +++ b/Mage/src/main/java/mage/game/turn/CombatDamageStep.java @@ -2,6 +2,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.combat.CombatGroup; diff --git a/Mage/src/main/java/mage/game/turn/DeclareAttackersStep.java b/Mage/src/main/java/mage/game/turn/DeclareAttackersStep.java index f4d7d6ccf54..3372255eb90 100644 --- a/Mage/src/main/java/mage/game/turn/DeclareAttackersStep.java +++ b/Mage/src/main/java/mage/game/turn/DeclareAttackersStep.java @@ -3,6 +3,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/game/turn/DeclareBlockersStep.java b/Mage/src/main/java/mage/game/turn/DeclareBlockersStep.java index 774b264ddec..1be18c6bc25 100644 --- a/Mage/src/main/java/mage/game/turn/DeclareBlockersStep.java +++ b/Mage/src/main/java/mage/game/turn/DeclareBlockersStep.java @@ -2,6 +2,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/game/turn/DrawStep.java b/Mage/src/main/java/mage/game/turn/DrawStep.java index 1e721d416b8..2e60b46b69a 100644 --- a/Mage/src/main/java/mage/game/turn/DrawStep.java +++ b/Mage/src/main/java/mage/game/turn/DrawStep.java @@ -3,6 +3,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/game/turn/EndOfCombatStep.java b/Mage/src/main/java/mage/game/turn/EndOfCombatStep.java index d7a6b9bec95..80d9d9e8bc5 100644 --- a/Mage/src/main/java/mage/game/turn/EndOfCombatStep.java +++ b/Mage/src/main/java/mage/game/turn/EndOfCombatStep.java @@ -3,6 +3,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/game/turn/FirstCombatDamageStep.java b/Mage/src/main/java/mage/game/turn/FirstCombatDamageStep.java index ccab10fe2ab..7c7f1221fa1 100644 --- a/Mage/src/main/java/mage/game/turn/FirstCombatDamageStep.java +++ b/Mage/src/main/java/mage/game/turn/FirstCombatDamageStep.java @@ -2,6 +2,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.combat.CombatGroup; diff --git a/Mage/src/main/java/mage/game/turn/Phase.java b/Mage/src/main/java/mage/game/turn/Phase.java index 2cf15e94e76..5a561db45f3 100644 --- a/Mage/src/main/java/mage/game/turn/Phase.java +++ b/Mage/src/main/java/mage/game/turn/Phase.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.UUID; + import mage.constants.PhaseStep; import mage.constants.TurnPhase; import mage.game.Game; diff --git a/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java b/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java index 9806e61d9dc..6fa6a7bb9d3 100644 --- a/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java +++ b/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java @@ -2,6 +2,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.constants.SubType; import mage.counters.CounterType; diff --git a/Mage/src/main/java/mage/game/turn/Step.java b/Mage/src/main/java/mage/game/turn/Step.java index c7633190e5d..828ac68b664 100644 --- a/Mage/src/main/java/mage/game/turn/Step.java +++ b/Mage/src/main/java/mage/game/turn/Step.java @@ -3,6 +3,7 @@ package mage.game.turn; import java.io.Serializable; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/game/turn/Turn.java b/Mage/src/main/java/mage/game/turn/Turn.java index 359f2542563..70337a84e96 100644 --- a/Mage/src/main/java/mage/game/turn/Turn.java +++ b/Mage/src/main/java/mage/game/turn/Turn.java @@ -1,5 +1,11 @@ package mage.game.turn; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; + import mage.abilities.Ability; import mage.constants.PhaseStep; import mage.constants.TurnPhase; @@ -12,12 +18,6 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.util.ThreadLocalStringBuilder; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/game/turn/TurnMod.java b/Mage/src/main/java/mage/game/turn/TurnMod.java index f5246ae6ea0..29adcdf8dea 100644 --- a/Mage/src/main/java/mage/game/turn/TurnMod.java +++ b/Mage/src/main/java/mage/game/turn/TurnMod.java @@ -4,6 +4,7 @@ package mage.game.turn; import java.io.Serializable; import java.util.UUID; + import mage.constants.PhaseStep; import mage.constants.TurnPhase; diff --git a/Mage/src/main/java/mage/game/turn/TurnMods.java b/Mage/src/main/java/mage/game/turn/TurnMods.java index a1ab81b7cd5..8a20ae929f8 100644 --- a/Mage/src/main/java/mage/game/turn/TurnMods.java +++ b/Mage/src/main/java/mage/game/turn/TurnMods.java @@ -4,6 +4,7 @@ package mage.game.turn; import java.util.ArrayList; import java.util.ListIterator; import java.util.UUID; + import mage.constants.PhaseStep; import mage.constants.TurnPhase; diff --git a/Mage/src/main/java/mage/game/turn/UntapStep.java b/Mage/src/main/java/mage/game/turn/UntapStep.java index d9c0c28f38d..34858fc4a99 100644 --- a/Mage/src/main/java/mage/game/turn/UntapStep.java +++ b/Mage/src/main/java/mage/game/turn/UntapStep.java @@ -3,6 +3,7 @@ package mage.game.turn; import java.util.UUID; + import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/players/Library.java b/Mage/src/main/java/mage/players/Library.java index 82323073e8c..cb0fd5e6a50 100644 --- a/Mage/src/main/java/mage/players/Library.java +++ b/Mage/src/main/java/mage/players/Library.java @@ -1,15 +1,28 @@ package mage.players; +import java.io.Serializable; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.cards.Card; import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.util.RandomUtil; -import java.io.Serializable; -import java.util.*; -import java.util.stream.Collectors; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/players/ManaPool.java b/Mage/src/main/java/mage/players/ManaPool.java index 2c5df2da273..d8206ba5e7e 100644 --- a/Mage/src/main/java/mage/players/ManaPool.java +++ b/Mage/src/main/java/mage/players/ManaPool.java @@ -1,5 +1,13 @@ package mage.players; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.ConditionalMana; import mage.Mana; import mage.abilities.Ability; @@ -15,9 +23,6 @@ import mage.game.events.GameEvent.EventType; import mage.game.events.ManaEvent; import mage.game.stack.Spell; -import java.io.Serializable; -import java.util.*; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/players/ManaPoolItem.java b/Mage/src/main/java/mage/players/ManaPoolItem.java index 34db510c208..426e607f61e 100644 --- a/Mage/src/main/java/mage/players/ManaPoolItem.java +++ b/Mage/src/main/java/mage/players/ManaPoolItem.java @@ -3,6 +3,7 @@ package mage.players; import java.io.Serializable; import java.util.UUID; + import mage.ConditionalMana; import mage.MageObject; import mage.Mana; diff --git a/Mage/src/main/java/mage/players/Player.java b/Mage/src/main/java/mage/players/Player.java index b81a841ec62..c5c95046502 100644 --- a/Mage/src/main/java/mage/players/Player.java +++ b/Mage/src/main/java/mage/players/Player.java @@ -1,9 +1,23 @@ package mage.players; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + import mage.MageItem; import mage.MageObject; import mage.MageObjectReference; -import mage.abilities.*; +import mage.abilities.Abilities; +import mage.abilities.Ability; +import mage.abilities.ActivatedAbility; +import mage.abilities.Mode; +import mage.abilities.Modes; +import mage.abilities.SpellAbility; +import mage.abilities.TriggeredAbility; import mage.abilities.costs.AlternativeSourceCosts; import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; @@ -15,7 +29,13 @@ import mage.cards.Card; import mage.cards.Cards; import mage.cards.decks.Deck; import mage.choices.Choice; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.ManaType; +import mage.constants.Outcome; +import mage.constants.PlanarDieRoll; +import mage.constants.PlayerAction; +import mage.constants.RangeOfInfluence; +import mage.constants.Zone; import mage.counters.Counter; import mage.counters.Counters; import mage.designations.Designation; @@ -38,9 +58,6 @@ import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; import mage.util.Copyable; -import java.io.Serializable; -import java.util.*; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 942826f2bb6..89a06ddf1f9 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -1,31 +1,89 @@ package mage.players; +import java.io.Serializable; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + +import org.apache.log4j.Logger; + import com.google.common.collect.ImmutableMap; + import mage.ConditionalMana; import mage.MageObject; import mage.MageObjectReference; import mage.Mana; -import mage.abilities.*; +import mage.abilities.Abilities; +import mage.abilities.AbilitiesImpl; +import mage.abilities.Ability; +import mage.abilities.ActivatedAbility; import mage.abilities.ActivatedAbility.ActivationStatus; +import mage.abilities.DelayedTriggeredAbility; +import mage.abilities.Mode; +import mage.abilities.PlayLandAbility; +import mage.abilities.SpecialAction; +import mage.abilities.SpellAbility; +import mage.abilities.TriggeredAbility; import mage.abilities.common.PassAbility; import mage.abilities.common.PlayLandAsCommanderAbility; import mage.abilities.common.WhileSearchingPlayFromLibraryAbility; import mage.abilities.common.delayed.AtTheEndOfTurnStepPostDelayedTriggeredAbility; -import mage.abilities.costs.*; +import mage.abilities.costs.AlternativeCostSourceAbility; +import mage.abilities.costs.AlternativeSourceCosts; +import mage.abilities.costs.Cost; +import mage.abilities.costs.Costs; +import mage.abilities.costs.OptionalAdditionalSourceCosts; import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.RestrictionUntapNotMoreThanEffect; import mage.abilities.effects.common.LoseControlOnOtherPlayersControllerEffect; -import mage.abilities.keyword.*; +import mage.abilities.keyword.FlashbackAbility; +import mage.abilities.keyword.HexproofAbility; +import mage.abilities.keyword.HexproofFromBlackAbility; +import mage.abilities.keyword.HexproofFromBlueAbility; +import mage.abilities.keyword.HexproofFromMonocoloredAbility; +import mage.abilities.keyword.HexproofFromWhiteAbility; +import mage.abilities.keyword.InfectAbility; +import mage.abilities.keyword.LifelinkAbility; +import mage.abilities.keyword.ProtectionAbility; +import mage.abilities.keyword.ShroudAbility; +import mage.abilities.keyword.SquirrellinkAbility; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.abilities.mana.ManaOptions; import mage.actions.MageDrawAction; -import mage.cards.*; +import mage.cards.AdventureCard; +import mage.cards.Card; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.cards.SplitCard; import mage.cards.decks.Deck; import mage.choices.ChoiceImpl; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.AsThoughEffectType; +import mage.constants.ManaType; +import mage.constants.Outcome; +import mage.constants.PhaseStep; +import mage.constants.PlanarDieRoll; +import mage.constants.PlayerAction; +import mage.constants.RangeOfInfluence; +import mage.constants.SpellAbilityType; +import mage.constants.TimingRule; +import mage.constants.Zone; import mage.counters.Counter; import mage.counters.CounterType; import mage.counters.Counters; @@ -39,11 +97,20 @@ import mage.filter.common.FilterCreatureForCombat; import mage.filter.common.FilterCreatureForCombatBlock; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.PermanentIdPredicate; -import mage.game.*; +import mage.game.ExileZone; +import mage.game.Game; +import mage.game.Graveyard; +import mage.game.Table; +import mage.game.ZoneChangeInfo; +import mage.game.ZonesHandler; import mage.game.combat.CombatGroup; import mage.game.command.CommandObject; -import mage.game.events.*; +import mage.game.events.DamagePlayerEvent; +import mage.game.events.DamagedPlayerEvent; +import mage.game.events.FlipCoinEvent; +import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import mage.game.events.ZoneChangeEvent; import mage.game.match.MatchPlayer; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentCard; @@ -63,11 +130,6 @@ import mage.target.common.TargetDiscard; import mage.util.CardUtil; import mage.util.GameLog; import mage.util.RandomUtil; -import org.apache.log4j.Logger; - -import java.io.Serializable; -import java.util.*; -import java.util.Map.Entry; public abstract class PlayerImpl implements Player, Serializable { diff --git a/Mage/src/main/java/mage/players/PlayerList.java b/Mage/src/main/java/mage/players/PlayerList.java index f25b5a9a16d..8eae489b1d8 100644 --- a/Mage/src/main/java/mage/players/PlayerList.java +++ b/Mage/src/main/java/mage/players/PlayerList.java @@ -1,10 +1,10 @@ package mage.players; +import java.util.UUID; + import mage.game.Game; import mage.util.CircularList; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/players/StubPlayer.java b/Mage/src/main/java/mage/players/StubPlayer.java index 68913380020..9bf01749916 100644 --- a/Mage/src/main/java/mage/players/StubPlayer.java +++ b/Mage/src/main/java/mage/players/StubPlayer.java @@ -1,5 +1,13 @@ package mage.players; +import static com.google.common.collect.Iterables.getOnlyElement; +import static java.util.stream.Collectors.toList; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import mage.MageItem; import mage.abilities.Ability; import mage.abilities.Mode; @@ -13,6 +21,7 @@ import mage.cards.decks.Deck; import mage.choices.Choice; import mage.constants.Outcome; import mage.constants.RangeOfInfluence; +import mage.filter.FilterMana; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.draft.Draft; @@ -24,15 +33,6 @@ import mage.target.TargetAmount; import mage.target.TargetCard; import mage.target.TargetPlayer; -import java.io.Serializable; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import static com.google.common.collect.Iterables.getOnlyElement; -import static java.util.stream.Collectors.toList; -import mage.filter.FilterMana; - public class StubPlayer extends PlayerImpl implements Player { public boolean choose(Outcome outcome, Target target, UUID sourceId, Game game) { diff --git a/Mage/src/main/java/mage/players/net/SkipPrioritySteps.java b/Mage/src/main/java/mage/players/net/SkipPrioritySteps.java index c29e4965cf0..20e1623234a 100644 --- a/Mage/src/main/java/mage/players/net/SkipPrioritySteps.java +++ b/Mage/src/main/java/mage/players/net/SkipPrioritySteps.java @@ -2,6 +2,7 @@ package mage.players.net; import java.io.Serializable; + import mage.constants.PhaseStep; /** diff --git a/Mage/src/main/java/mage/players/net/UserData.java b/Mage/src/main/java/mage/players/net/UserData.java index 06f2aff9224..9dd8cc8eac8 100644 --- a/Mage/src/main/java/mage/players/net/UserData.java +++ b/Mage/src/main/java/mage/players/net/UserData.java @@ -1,7 +1,11 @@ package mage.players.net; import java.io.Serializable; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.UUID; /** * User data that is passed during connection to the server. diff --git a/Mage/src/main/java/mage/target/Target.java b/Mage/src/main/java/mage/target/Target.java index a9b7d45ec04..100248a2d0b 100644 --- a/Mage/src/main/java/mage/target/Target.java +++ b/Mage/src/main/java/mage/target/Target.java @@ -1,5 +1,10 @@ package mage.target; +import java.io.Serializable; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.constants.Outcome; import mage.constants.Zone; @@ -7,11 +12,6 @@ import mage.filter.Filter; import mage.game.Game; import mage.players.Player; -import java.io.Serializable; -import java.util.List; -import java.util.Set; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/target/TargetAmount.java b/Mage/src/main/java/mage/target/TargetAmount.java index 41da56d5ea1..70cdd5e7a83 100644 --- a/Mage/src/main/java/mage/target/TargetAmount.java +++ b/Mage/src/main/java/mage/target/TargetAmount.java @@ -1,17 +1,17 @@ package mage.target; -import mage.abilities.Ability; -import mage.abilities.dynamicvalue.DynamicValue; -import mage.abilities.dynamicvalue.common.StaticValue; -import mage.constants.Outcome; -import mage.game.Game; - import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; +import mage.abilities.Ability; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.StaticValue; +import mage.constants.Outcome; +import mage.game.Game; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/target/TargetCard.java b/Mage/src/main/java/mage/target/TargetCard.java index 464b14ff221..6b89b9b5f02 100644 --- a/Mage/src/main/java/mage/target/TargetCard.java +++ b/Mage/src/main/java/mage/target/TargetCard.java @@ -1,5 +1,10 @@ package mage.target; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.MageItem; import mage.abilities.Ability; import mage.cards.Card; @@ -10,11 +15,6 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/target/TargetImpl.java b/Mage/src/main/java/mage/target/TargetImpl.java index 438bbb35ada..a0005ccbc97 100644 --- a/Mage/src/main/java/mage/target/TargetImpl.java +++ b/Mage/src/main/java/mage/target/TargetImpl.java @@ -1,5 +1,14 @@ package mage.target; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.cards.Card; @@ -12,8 +21,6 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.util.RandomUtil; -import java.util.*; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/target/TargetObject.java b/Mage/src/main/java/mage/target/TargetObject.java index 575ad44873d..7c1dfc1c50d 100644 --- a/Mage/src/main/java/mage/target/TargetObject.java +++ b/Mage/src/main/java/mage/target/TargetObject.java @@ -1,6 +1,7 @@ package mage.target; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/TargetPermanent.java b/Mage/src/main/java/mage/target/TargetPermanent.java index 65a8e26e33c..5badd35a8b8 100644 --- a/Mage/src/main/java/mage/target/TargetPermanent.java +++ b/Mage/src/main/java/mage/target/TargetPermanent.java @@ -1,5 +1,9 @@ package mage.target; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.Zone; @@ -8,10 +12,6 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/target/TargetPlayer.java b/Mage/src/main/java/mage/target/TargetPlayer.java index 7b2d0bdf775..6f334e0ef40 100644 --- a/Mage/src/main/java/mage/target/TargetPlayer.java +++ b/Mage/src/main/java/mage/target/TargetPlayer.java @@ -3,6 +3,7 @@ package mage.target; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.filter.FilterPlayer; diff --git a/Mage/src/main/java/mage/target/TargetSource.java b/Mage/src/main/java/mage/target/TargetSource.java index e0dae36e505..2a1f0985524 100644 --- a/Mage/src/main/java/mage/target/TargetSource.java +++ b/Mage/src/main/java/mage/target/TargetSource.java @@ -5,6 +5,7 @@ package mage.target; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/target/TargetSpell.java b/Mage/src/main/java/mage/target/TargetSpell.java index 0fe66adb0a6..a559d90d6aa 100644 --- a/Mage/src/main/java/mage/target/TargetSpell.java +++ b/Mage/src/main/java/mage/target/TargetSpell.java @@ -1,6 +1,11 @@ package mage.target; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.abilities.Ability; import mage.constants.Zone; import mage.filter.FilterSpell; @@ -9,11 +14,6 @@ import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackObject; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/target/TargetStackObject.java b/Mage/src/main/java/mage/target/TargetStackObject.java index eeccdc2df7f..5145c807715 100644 --- a/Mage/src/main/java/mage/target/TargetStackObject.java +++ b/Mage/src/main/java/mage/target/TargetStackObject.java @@ -1,5 +1,9 @@ package mage.target; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.constants.Zone; import mage.filter.FilterStackObject; @@ -7,10 +11,6 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.stack.StackObject; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/target/Targets.java b/Mage/src/main/java/mage/target/Targets.java index 0409700fe44..41f844377c6 100644 --- a/Mage/src/main/java/mage/target/Targets.java +++ b/Mage/src/main/java/mage/target/Targets.java @@ -1,17 +1,23 @@ package mage.target; -import mage.abilities.Ability; -import mage.constants.Outcome; -import mage.game.Game; -import mage.game.events.GameEvent; -import mage.target.targetpointer.*; -import org.apache.log4j.Logger; - import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; +import org.apache.log4j.Logger; + +import mage.abilities.Ability; +import mage.constants.Outcome; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.target.targetpointer.FirstTargetPointer; +import mage.target.targetpointer.FixedTarget; +import mage.target.targetpointer.FixedTargets; +import mage.target.targetpointer.SecondTargetPointer; +import mage.target.targetpointer.TargetPointer; +import mage.target.targetpointer.ThirdTargetPointer; + /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/target/common/TargetActivatedAbility.java b/Mage/src/main/java/mage/target/common/TargetActivatedAbility.java index 5e1ca2be78f..eb80a4b633f 100644 --- a/Mage/src/main/java/mage/target/common/TargetActivatedAbility.java +++ b/Mage/src/main/java/mage/target/common/TargetActivatedAbility.java @@ -4,8 +4,8 @@ package mage.target.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; -import mage.abilities.ActivatedAbility; import mage.constants.AbilityType; import mage.constants.Zone; import mage.filter.Filter; diff --git a/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java b/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java index 6552c4bba01..c9dfd125c55 100644 --- a/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java +++ b/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java @@ -4,6 +4,7 @@ package mage.target.common; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; + import mage.abilities.Ability; import mage.constants.AbilityType; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbilityOrLegendarySpell.java b/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbilityOrLegendarySpell.java index f8e04dd2f22..a4288bb2004 100644 --- a/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbilityOrLegendarySpell.java +++ b/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbilityOrLegendarySpell.java @@ -1,6 +1,10 @@ package mage.target.common; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.abilities.Ability; import mage.constants.AbilityType; import mage.constants.Zone; @@ -11,10 +15,6 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.target.TargetObject; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; - public class TargetActivatedOrTriggeredAbilityOrLegendarySpell extends TargetObject { protected final FilterStackObject filter; diff --git a/Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java index 86721777d32..db93aeb995b 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java @@ -3,6 +3,7 @@ package mage.target.common; import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/common/TargetCardInExile.java b/Mage/src/main/java/mage/target/common/TargetCardInExile.java index a68aa088f7c..9f7a3793273 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInExile.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInExile.java @@ -4,6 +4,7 @@ package mage.target.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java index 746ed21a6d9..33df652b685 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java @@ -3,6 +3,7 @@ package mage.target.common; import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/common/TargetCardInGraveyardOrBattlefield.java b/Mage/src/main/java/mage/target/common/TargetCardInGraveyardOrBattlefield.java index c19aebe893a..75762d4326b 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInGraveyardOrBattlefield.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInGraveyardOrBattlefield.java @@ -1,5 +1,8 @@ package mage.target.common; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.Zone; @@ -9,9 +12,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetCard; -import java.util.Set; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/target/common/TargetCardInHand.java b/Mage/src/main/java/mage/target/common/TargetCardInHand.java index dd3a6be708e..c87ea5fde5e 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInHand.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInHand.java @@ -1,5 +1,9 @@ package mage.target.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.constants.Zone; @@ -9,10 +13,6 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.target.TargetCard; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * @author BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java index 4ebbfa167fd..b4687208b73 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java @@ -1,6 +1,7 @@ package mage.target.common; import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java index e596adce261..a6ebee83b7b 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java @@ -3,6 +3,7 @@ package mage.target.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.cards.Cards; diff --git a/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java index f9c867c1e3f..11740fdfb50 100644 --- a/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java +++ b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java @@ -1,14 +1,14 @@ package mage.target.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; import mage.game.Game; import mage.players.Player; import mage.target.TargetPermanent; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/target/common/TargetCreatureOrPlayer.java b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlayer.java index 2c74ef554a8..7e3f274ea52 100644 --- a/Mage/src/main/java/mage/target/common/TargetCreatureOrPlayer.java +++ b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlayer.java @@ -1,9 +1,13 @@ package mage.target.common; -import mage.constants.Zone; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; +import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreatureOrPlayer; import mage.game.Game; @@ -11,10 +15,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetImpl; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/target/common/TargetCreaturePermanent.java b/Mage/src/main/java/mage/target/common/TargetCreaturePermanent.java index 196d965365c..60821c07b95 100644 --- a/Mage/src/main/java/mage/target/common/TargetCreaturePermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetCreaturePermanent.java @@ -1,8 +1,9 @@ package mage.target.common; -import mage.filter.StaticFilters; import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURE; + +import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; diff --git a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java index 642440373a3..4bdfd85221b 100644 --- a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java +++ b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java @@ -2,6 +2,7 @@ package mage.target.common; import java.util.UUID; + import mage.abilities.Ability; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; diff --git a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java index 4bbc69cabcd..1ab48732ef3 100644 --- a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java +++ b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java @@ -1,13 +1,13 @@ package mage.target.common; +import java.util.UUID; + import mage.abilities.Ability; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/target/common/TargetDefender.java b/Mage/src/main/java/mage/target/common/TargetDefender.java index 863c419b28a..d941264522f 100644 --- a/Mage/src/main/java/mage/target/common/TargetDefender.java +++ b/Mage/src/main/java/mage/target/common/TargetDefender.java @@ -4,6 +4,7 @@ package mage.target.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/common/TargetDiscard.java b/Mage/src/main/java/mage/target/common/TargetDiscard.java index a88be8445f9..18307103859 100644 --- a/Mage/src/main/java/mage/target/common/TargetDiscard.java +++ b/Mage/src/main/java/mage/target/common/TargetDiscard.java @@ -1,16 +1,16 @@ package mage.target.common; -import mage.constants.Zone; +import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; +import mage.constants.Zone; import mage.filter.FilterCard; -import mage.game.Game; -import mage.target.TargetCard; - -import java.util.UUID; import mage.filter.StaticFilters; import mage.filter.predicate.other.OwnerIdPredicate; +import mage.game.Game; +import mage.target.TargetCard; /** * diff --git a/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java b/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java index 766be3b681d..4e9db0b86ee 100644 --- a/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java @@ -1,5 +1,7 @@ package mage.target.common; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.Outcome; @@ -9,8 +11,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; -import java.util.UUID; - /** * @author Mael */ diff --git a/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java b/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java index ecfd696f5c3..da77af99cc5 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java @@ -1,5 +1,10 @@ package mage.target.common; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -11,11 +16,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetAmount; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java index cee4973c4f8..671d3ec7bc8 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java @@ -1,5 +1,9 @@ package mage.target.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.Zone; @@ -11,10 +15,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetImpl; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerAmount.java b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerAmount.java index adc75fae2cc..408b913c7f5 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerAmount.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerAmount.java @@ -1,5 +1,10 @@ package mage.target.common; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -10,11 +15,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetAmount; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; - /** * @author TheElk801 */ diff --git a/Mage/src/main/java/mage/target/common/TargetPermanentOrSuspendedCard.java b/Mage/src/main/java/mage/target/common/TargetPermanentOrSuspendedCard.java index 1575dcc4bad..bedb721e521 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentOrSuspendedCard.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentOrSuspendedCard.java @@ -32,6 +32,7 @@ package mage.target.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/target/common/TargetSpellOrPermanent.java b/Mage/src/main/java/mage/target/common/TargetSpellOrPermanent.java index f2a846ba375..910f5064ffe 100644 --- a/Mage/src/main/java/mage/target/common/TargetSpellOrPermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetSpellOrPermanent.java @@ -32,6 +32,7 @@ package mage.target.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java b/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java index 5efeb3552d5..2461032abfd 100644 --- a/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java +++ b/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java @@ -4,6 +4,7 @@ package mage.target.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java index 82241949ebf..2299cd088e0 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.game.Game; diff --git a/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java b/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java index 06a2eaf0e4d..fcc3c1a9d23 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java +++ b/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java @@ -1,5 +1,10 @@ package mage.target.targetpointer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.cards.Card; @@ -7,11 +12,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; - public class FixedTarget implements TargetPointer { private final UUID targetId; diff --git a/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java b/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java index f4ca2f05c36..7a5ac93c15e 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java +++ b/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.UUID; + import mage.MageObjectReference; import mage.abilities.Ability; import mage.cards.Card; diff --git a/Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java index 9d2779b4efd..a30f736f142 100644 --- a/Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java @@ -1,6 +1,11 @@ package mage.target.targetpointer; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.game.Game; diff --git a/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java index 6dd021c9ac5..493c63de8bf 100644 --- a/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java @@ -3,6 +3,7 @@ package mage.target.targetpointer; import java.io.Serializable; import java.util.List; import java.util.UUID; + import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/main/java/mage/target/targetpointer/ThirdTargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/ThirdTargetPointer.java index 206bfe2eb9e..05787ab35ba 100644 --- a/Mage/src/main/java/mage/target/targetpointer/ThirdTargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/ThirdTargetPointer.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; + import mage.abilities.Ability; import mage.cards.Card; import mage.game.Game; diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 97df0a692db..4eae2f58dad 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -1,20 +1,5 @@ package mage.util; -import mage.MageObject; -import mage.Mana; -import mage.abilities.Ability; -import mage.abilities.SpellAbility; -import mage.abilities.costs.VariableCost; -import mage.abilities.costs.mana.*; -import mage.cards.Card; -import mage.constants.EmptyNames; -import mage.filter.Filter; -import mage.game.CardState; -import mage.game.Game; -import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; -import mage.util.functions.CopyTokenFunction; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; @@ -24,6 +9,28 @@ import java.util.List; import java.util.Objects; import java.util.UUID; +import mage.MageObject; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.SpellAbility; +import mage.abilities.costs.VariableCost; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.costs.mana.HybridManaCost; +import mage.abilities.costs.mana.ManaCost; +import mage.abilities.costs.mana.ManaCosts; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.costs.mana.MonoHybridManaCost; +import mage.abilities.costs.mana.SnowManaCost; +import mage.abilities.costs.mana.VariableManaCost; +import mage.cards.Card; +import mage.constants.EmptyNames; +import mage.filter.Filter; +import mage.game.CardState; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.game.permanent.token.Token; +import mage.util.functions.CopyTokenFunction; + /** * @author nantuko */ diff --git a/Mage/src/main/java/mage/util/ClassScanner.java b/Mage/src/main/java/mage/util/ClassScanner.java index a884ab3d759..5aa3208efea 100644 --- a/Mage/src/main/java/mage/util/ClassScanner.java +++ b/Mage/src/main/java/mage/util/ClassScanner.java @@ -4,7 +4,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; diff --git a/Mage/src/main/java/mage/util/DeckUtil.java b/Mage/src/main/java/mage/util/DeckUtil.java index 38da6de811e..9fa3ffcf59e 100644 --- a/Mage/src/main/java/mage/util/DeckUtil.java +++ b/Mage/src/main/java/mage/util/DeckUtil.java @@ -1,12 +1,12 @@ package mage.util; -import org.apache.log4j.Logger; - import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; +import org.apache.log4j.Logger; + /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/util/JarVersion.java b/Mage/src/main/java/mage/util/JarVersion.java index 3089b441ab0..f8cd4d4ad82 100644 --- a/Mage/src/main/java/mage/util/JarVersion.java +++ b/Mage/src/main/java/mage/util/JarVersion.java @@ -1,7 +1,5 @@ package mage.util; -import org.apache.log4j.Logger; - import java.net.URL; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; @@ -9,6 +7,8 @@ import java.time.temporal.TemporalAccessor; import java.util.jar.Attributes; import java.util.jar.Manifest; +import org.apache.log4j.Logger; + /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/util/ManaUtil.java b/Mage/src/main/java/mage/util/ManaUtil.java index d153fe93155..9315131b2e6 100644 --- a/Mage/src/main/java/mage/util/ManaUtil.java +++ b/Mage/src/main/java/mage/util/ManaUtil.java @@ -1,15 +1,32 @@ package mage.util; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Set; +import java.util.UUID; + import mage.MageObject; import mage.Mana; import mage.ManaSymbol; import mage.abilities.Ability; import mage.abilities.costs.Cost; -import mage.abilities.costs.mana.*; +import mage.abilities.costs.mana.AlternateManaPaymentAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.costs.mana.ManaCost; +import mage.abilities.costs.mana.ManaSymbols; +import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; -import mage.abilities.mana.*; +import mage.abilities.mana.ActivatedManaAbilityImpl; +import mage.abilities.mana.AnyColorManaAbility; +import mage.abilities.mana.BasicManaAbility; +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.cards.Card; import mage.choices.Choice; import mage.constants.ColoredManaSymbol; @@ -17,8 +34,6 @@ import mage.filter.FilterMana; import mage.game.Game; import mage.players.Player; -import java.util.*; - /** * @author noxx */ diff --git a/Mage/src/main/java/mage/util/RandomUtil.java b/Mage/src/main/java/mage/util/RandomUtil.java index 37f6d78eb93..9b2920e80d2 100644 --- a/Mage/src/main/java/mage/util/RandomUtil.java +++ b/Mage/src/main/java/mage/util/RandomUtil.java @@ -1,6 +1,6 @@ package mage.util; -import java.awt.*; +import java.awt.Color; import java.util.Random; /** diff --git a/Mage/src/main/java/mage/util/SubTypeList.java b/Mage/src/main/java/mage/util/SubTypeList.java index a7863b6028d..07b90603775 100644 --- a/Mage/src/main/java/mage/util/SubTypeList.java +++ b/Mage/src/main/java/mage/util/SubTypeList.java @@ -1,12 +1,12 @@ package mage.util; -import mage.constants.SubType; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.stream.Collectors; +import mage.constants.SubType; + public class SubTypeList extends ArrayList { public SubTypeList(SubType firstSubType) { diff --git a/Mage/src/main/java/mage/util/TargetAddress.java b/Mage/src/main/java/mage/util/TargetAddress.java index 703d0eaf3ef..040a84bc2dc 100644 --- a/Mage/src/main/java/mage/util/TargetAddress.java +++ b/Mage/src/main/java/mage/util/TargetAddress.java @@ -4,6 +4,7 @@ package mage.util; import java.util.Iterator; import java.util.Objects; import java.util.UUID; + import mage.abilities.Mode; import mage.abilities.Modes; import mage.abilities.SpellAbility; diff --git a/Mage/src/main/java/mage/util/functions/AbilityApplier.java b/Mage/src/main/java/mage/util/functions/AbilityApplier.java index abbc57d3541..1e5dde5dc26 100644 --- a/Mage/src/main/java/mage/util/functions/AbilityApplier.java +++ b/Mage/src/main/java/mage/util/functions/AbilityApplier.java @@ -2,6 +2,7 @@ package mage.util.functions; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/main/java/mage/util/functions/AddSubtypeApplier.java b/Mage/src/main/java/mage/util/functions/AddSubtypeApplier.java index 6f5c35e93dd..f799fea76e0 100644 --- a/Mage/src/main/java/mage/util/functions/AddSubtypeApplier.java +++ b/Mage/src/main/java/mage/util/functions/AddSubtypeApplier.java @@ -5,14 +5,14 @@ */ package mage.util.functions; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/util/functions/ApplyToMageObject.java b/Mage/src/main/java/mage/util/functions/ApplyToMageObject.java index adbf0828689..33223be492b 100644 --- a/Mage/src/main/java/mage/util/functions/ApplyToMageObject.java +++ b/Mage/src/main/java/mage/util/functions/ApplyToMageObject.java @@ -1,10 +1,11 @@ package mage.util.functions; +import java.util.Objects; +import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.game.Game; -import java.util.Objects; -import java.util.UUID; /** * @author LevelX2 diff --git a/Mage/src/main/java/mage/util/functions/ApplyToPermanent.java b/Mage/src/main/java/mage/util/functions/ApplyToPermanent.java index ffde9aeca07..9ce87d8f51b 100644 --- a/Mage/src/main/java/mage/util/functions/ApplyToPermanent.java +++ b/Mage/src/main/java/mage/util/functions/ApplyToPermanent.java @@ -1,12 +1,12 @@ package mage.util.functions; +import java.io.Serializable; +import java.util.UUID; + import mage.abilities.Ability; import mage.game.Game; import mage.game.permanent.Permanent; -import java.io.Serializable; -import java.util.UUID; - /** * @author noxx */ diff --git a/Mage/src/main/java/mage/util/functions/CardTypeApplier.java b/Mage/src/main/java/mage/util/functions/CardTypeApplier.java index 2ca57fb0a2b..2ad029a2c88 100644 --- a/Mage/src/main/java/mage/util/functions/CardTypeApplier.java +++ b/Mage/src/main/java/mage/util/functions/CardTypeApplier.java @@ -2,6 +2,7 @@ package mage.util.functions; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.constants.CardType; diff --git a/Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java b/Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java index c838a8f7566..a6108493c07 100644 --- a/Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java +++ b/Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java @@ -1,6 +1,7 @@ package mage.util.functions; import java.util.UUID; + import mage.MageObject; import mage.abilities.Ability; import mage.game.Game; diff --git a/Mage/src/main/java/mage/util/trace/TraceUtil.java b/Mage/src/main/java/mage/util/trace/TraceUtil.java index 8b20c8cccbc..40cdcce4f69 100644 --- a/Mage/src/main/java/mage/util/trace/TraceUtil.java +++ b/Mage/src/main/java/mage/util/trace/TraceUtil.java @@ -1,5 +1,11 @@ package mage.util.trace; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.MageObject; import mage.abilities.Ability; import mage.abilities.StaticAbility; @@ -14,9 +20,6 @@ import mage.game.Game; import mage.game.combat.Combat; import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; -import org.apache.log4j.Logger; - -import java.util.*; /** * @author magenoxx_at_gmail.com diff --git a/Mage/src/main/java/mage/watchers/Watcher.java b/Mage/src/main/java/mage/watchers/Watcher.java index 97ebc27bc06..c9d4dd81ba4 100644 --- a/Mage/src/main/java/mage/watchers/Watcher.java +++ b/Mage/src/main/java/mage/watchers/Watcher.java @@ -1,16 +1,28 @@ package mage.watchers; +import java.io.Serializable; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import org.apache.log4j.Logger; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; -import org.apache.log4j.Logger; import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; -import java.io.Serializable; -import java.lang.reflect.*; -import java.util.*; - /** * watches for certain game events to occur and flags condition * diff --git a/Mage/src/main/java/mage/watchers/WatcherUtils.java b/Mage/src/main/java/mage/watchers/WatcherUtils.java index 75ee40a8d71..6b39a6d04c6 100644 --- a/Mage/src/main/java/mage/watchers/WatcherUtils.java +++ b/Mage/src/main/java/mage/watchers/WatcherUtils.java @@ -1,10 +1,11 @@ package mage.watchers; +import org.apache.log4j.Logger; + import mage.MageObject; import mage.abilities.Ability; import mage.game.Game; -import org.apache.log4j.Logger; /** * diff --git a/Mage/src/main/java/mage/watchers/Watchers.java b/Mage/src/main/java/mage/watchers/Watchers.java index 7fba3a54deb..f31e7e6421d 100644 --- a/Mage/src/main/java/mage/watchers/Watchers.java +++ b/Mage/src/main/java/mage/watchers/Watchers.java @@ -1,11 +1,12 @@ package mage.watchers; -import mage.game.Game; -import mage.game.events.GameEvent; +import java.util.HashMap; + import org.apache.log4j.LogManager; import org.apache.log4j.Logger; -import java.util.HashMap; +import mage.game.Game; +import mage.game.events.GameEvent; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java index 3466db407f7..14be64e5bd6 100644 --- a/Mage/src/main/java/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java @@ -1,15 +1,14 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; 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/src/main/java/mage/watchers/common/AttackedLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/AttackedLastTurnWatcher.java index 93a26edd102..718efe29b80 100644 --- a/Mage/src/main/java/mage/watchers/common/AttackedLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/AttackedLastTurnWatcher.java @@ -4,9 +4,9 @@ package mage.watchers.common; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.UUID; + import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; diff --git a/Mage/src/main/java/mage/watchers/common/AttackedOrBlockedThisCombatWatcher.java b/Mage/src/main/java/mage/watchers/common/AttackedOrBlockedThisCombatWatcher.java index 7a9bf240a90..60612abc0b6 100644 --- a/Mage/src/main/java/mage/watchers/common/AttackedOrBlockedThisCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/AttackedOrBlockedThisCombatWatcher.java @@ -7,6 +7,7 @@ package mage.watchers.common; import java.util.HashSet; import java.util.Set; + import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; diff --git a/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java index 72ea6cfae37..b36a4590793 100644 --- a/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java @@ -1,6 +1,11 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; @@ -8,11 +13,6 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * @author magenoxx_at_gmail.com */ diff --git a/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java b/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java index 7d70b8f10ed..9b5ec01e4c3 100644 --- a/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; + import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; diff --git a/Mage/src/main/java/mage/watchers/common/BlockedByOnlyOneCreatureThisCombatWatcher.java b/Mage/src/main/java/mage/watchers/common/BlockedByOnlyOneCreatureThisCombatWatcher.java index 901ef40009e..247a7a9183e 100644 --- a/Mage/src/main/java/mage/watchers/common/BlockedByOnlyOneCreatureThisCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BlockedByOnlyOneCreatureThisCombatWatcher.java @@ -1,7 +1,12 @@ package mage.watchers.common; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; diff --git a/Mage/src/main/java/mage/watchers/common/BlockedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/BlockedThisTurnWatcher.java index 70b08e29c3d..ab2072b2b53 100644 --- a/Mage/src/main/java/mage/watchers/common/BlockedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BlockedThisTurnWatcher.java @@ -1,6 +1,9 @@ package mage.watchers.common; +import java.util.HashSet; +import java.util.Set; + import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; @@ -8,9 +11,6 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.watchers.Watcher; -import java.util.HashSet; -import java.util.Set; - /** * @author Quercitron */ diff --git a/Mage/src/main/java/mage/watchers/common/BloodthirstWatcher.java b/Mage/src/main/java/mage/watchers/common/BloodthirstWatcher.java index b70f17779b0..14e605ea305 100644 --- a/Mage/src/main/java/mage/watchers/common/BloodthirstWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BloodthirstWatcher.java @@ -7,8 +7,6 @@ import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.UUID; - /** * Must be installed to player for proper Bloodthirst work * diff --git a/Mage/src/main/java/mage/watchers/common/CardsAmountDrawnThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsAmountDrawnThisTurnWatcher.java index 60be9cbbbe7..bf4067947cf 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsAmountDrawnThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsAmountDrawnThisTurnWatcher.java @@ -1,16 +1,16 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * @author Quercitron * @author LevelX2 diff --git a/Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java index 0cb116c282b..17f7c048ac0 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java @@ -4,9 +4,9 @@ package mage.watchers.common; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.UUID; + import mage.MageObjectReference; import mage.cards.Card; import mage.cards.Cards; diff --git a/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java index e6b9499a124..0d342be7b48 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java @@ -1,16 +1,15 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.PhaseStep; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - /** * @author LevelX2 *

diff --git a/Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java index c865d22a31a..012465c0d64 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsDrawnThisTurnWatcher.java @@ -1,14 +1,14 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; 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 TheElk801 */ diff --git a/Mage/src/main/java/mage/watchers/common/CardsPutIntoGraveyardWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsPutIntoGraveyardWatcher.java index 6ab8c8a9528..0a73067aabc 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsPutIntoGraveyardWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsPutIntoGraveyardWatcher.java @@ -4,7 +4,6 @@ package mage.watchers.common; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.UUID; diff --git a/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java b/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java index 3391c0bf9fb..6b455d4cf7c 100644 --- a/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java @@ -1,6 +1,12 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.constants.Zone; import mage.game.Game; @@ -8,8 +14,6 @@ import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.watchers.Watcher; -import java.util.*; - /** * * @author LevelX2 diff --git a/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java b/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java index 5fbaebb330d..26642bb9053 100644 --- a/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java @@ -4,6 +4,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; import java.util.UUID; + import mage.constants.WatcherScope; import mage.constants.Zone; import mage.game.Game; diff --git a/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java index 328c6353112..d9bb1f1c7a7 100644 --- a/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java @@ -1,14 +1,17 @@ package mage.watchers.common; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.*; -import java.util.Map.Entry; - /** * @author nantuko, BetaSteward_at_googlemail.com */ diff --git a/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java index 656868ad253..6c98d9343b2 100644 --- a/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java @@ -1,15 +1,14 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - /** * @author nantuko, BetaSteward_at_googlemail.com (spjspj) */ diff --git a/Mage/src/main/java/mage/watchers/common/CommanderInfoWatcher.java b/Mage/src/main/java/mage/watchers/common/CommanderInfoWatcher.java index f2794367cc2..6184f0daf55 100644 --- a/Mage/src/main/java/mage/watchers/common/CommanderInfoWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CommanderInfoWatcher.java @@ -3,6 +3,7 @@ package mage.watchers.common; import java.util.HashMap; import java.util.Map; import java.util.UUID; + import mage.MageObject; import mage.cards.Card; import mage.constants.WatcherScope; diff --git a/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java b/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java index e8a093451ab..95c5c92ec5a 100644 --- a/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java @@ -1,5 +1,9 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.constants.Zone; import mage.game.Game; @@ -8,10 +12,6 @@ import mage.game.events.GameEvent.EventType; import mage.players.Player; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * Calcs commanders play count only from command zone (spell or land) * Cards like Remand can put command to hand and cast it without commander tax increase diff --git a/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java b/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java index df816d4d6d9..8a84b876e6b 100644 --- a/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java @@ -1,15 +1,14 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; 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/src/main/java/mage/watchers/common/CreatureWasCastWatcher.java b/Mage/src/main/java/mage/watchers/common/CreatureWasCastWatcher.java index 79da22b221e..04bb477d0f4 100644 --- a/Mage/src/main/java/mage/watchers/common/CreatureWasCastWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CreatureWasCastWatcher.java @@ -4,6 +4,7 @@ package mage.watchers.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.cards.Card; import mage.constants.WatcherScope; import mage.constants.Zone; diff --git a/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java b/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java index f97b7af0692..bab675ea6f4 100644 --- a/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java @@ -1,15 +1,15 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/watchers/common/DamageDoneWatcher.java b/Mage/src/main/java/mage/watchers/common/DamageDoneWatcher.java index 6e4008ab16a..7e5ddbc61b8 100644 --- a/Mage/src/main/java/mage/watchers/common/DamageDoneWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/DamageDoneWatcher.java @@ -5,16 +5,16 @@ */ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.MageObjectReference; import mage.constants.WatcherScope; 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/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java b/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java index 0d5ee938bda..7a364fe6440 100644 --- a/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java @@ -1,5 +1,9 @@ package mage.watchers.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.abilities.costs.Cost; import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.constants.SubType; @@ -10,10 +14,6 @@ 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 LevelX2 */ diff --git a/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java index 80a1a329ee2..a13feb958ff 100644 --- a/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java @@ -3,6 +3,7 @@ package mage.watchers.common; import java.util.HashMap; import java.util.Map; import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/watchers/common/GravestormWatcher.java b/Mage/src/main/java/mage/watchers/common/GravestormWatcher.java index 86f25b35f89..5ee8b2a5220 100644 --- a/Mage/src/main/java/mage/watchers/common/GravestormWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/GravestormWatcher.java @@ -2,7 +2,6 @@ package mage.watchers.common; import mage.constants.WatcherScope; -import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java b/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java index 2b4afc98bd3..ee198d95f2b 100644 --- a/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java @@ -1,15 +1,15 @@ package mage.watchers.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; 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 BetaSteward_at_googlemail.com * @author Loki diff --git a/Mage/src/main/java/mage/watchers/common/LifeLossOtherFromCombatWatcher.java b/Mage/src/main/java/mage/watchers/common/LifeLossOtherFromCombatWatcher.java index 71790be2359..820f3109388 100644 --- a/Mage/src/main/java/mage/watchers/common/LifeLossOtherFromCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/LifeLossOtherFromCombatWatcher.java @@ -4,6 +4,7 @@ package mage.watchers.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java b/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java index 30202fc773a..bbc22e42b0d 100644 --- a/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java @@ -1,5 +1,9 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.abilities.Ability; import mage.abilities.keyword.MiracleAbility; import mage.cards.Card; @@ -12,10 +16,6 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * Counts amount of cards drawn this turn by players. Asks players about Miracle * ability to be activated if it the first card drawn this turn. diff --git a/Mage/src/main/java/mage/watchers/common/NumberOfTimesPermanentTargetedATurnWatcher.java b/Mage/src/main/java/mage/watchers/common/NumberOfTimesPermanentTargetedATurnWatcher.java index e71a844b28d..86ac94a0d8c 100644 --- a/Mage/src/main/java/mage/watchers/common/NumberOfTimesPermanentTargetedATurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/NumberOfTimesPermanentTargetedATurnWatcher.java @@ -4,6 +4,7 @@ package mage.watchers.common; import java.util.HashMap; import java.util.Map; + import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; diff --git a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java index 9e74b0bae7b..930a93b3343 100644 --- a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java @@ -5,7 +5,11 @@ */ package mage.watchers.common; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; diff --git a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java index f0a2c4f20ab..e093e01d6db 100644 --- a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java @@ -5,14 +5,18 @@ */ package mage.watchers.common; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.watchers.Watcher; -import java.util.*; - /** * @author LevelX2 (spjspj) */ diff --git a/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java b/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java index c157be5f23c..9ea41e5298d 100644 --- a/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java @@ -5,7 +5,11 @@ */ package mage.watchers.common; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; diff --git a/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java b/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java index bd44334499e..550c5f1a2a8 100644 --- a/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java @@ -1,15 +1,14 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - /* * Counts the number of times the planar die has been rolled per player per turn * This watcher is automatically started in gameImpl.init for each game diff --git a/Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java index d0af1cecc23..a1147f36fe8 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java @@ -1,15 +1,15 @@ package mage.watchers.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; 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 jeffwadsworth */ diff --git a/Mage/src/main/java/mage/watchers/common/PlayerAttackedStepWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerAttackedStepWatcher.java index a710a145fa5..caa5fd0f6cd 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerAttackedStepWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerAttackedStepWatcher.java @@ -4,6 +4,7 @@ package mage.watchers.common; import java.util.HashMap; import java.util.Map; import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/watchers/common/PlayerCastCreatureWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerCastCreatureWatcher.java index 591731ca84c..fddfb83ba11 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerCastCreatureWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerCastCreatureWatcher.java @@ -1,16 +1,16 @@ package mage.watchers.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.constants.WatcherScope; 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 LevelX2 */ diff --git a/Mage/src/main/java/mage/watchers/common/PlayerDamagedBySourceWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerDamagedBySourceWatcher.java index c30c552ec41..22694a09fd4 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerDamagedBySourceWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerDamagedBySourceWatcher.java @@ -4,6 +4,7 @@ package mage.watchers.common; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java index 4c24cc1d226..7dd4ff58d89 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java @@ -3,7 +3,6 @@ package mage.watchers.common; import java.util.HashMap; import java.util.Map; -import java.util.Map.Entry; import java.util.UUID; import mage.constants.WatcherScope; diff --git a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java index 348e72ba1d6..751b91c8a1f 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java @@ -1,16 +1,15 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - /* * Counts amount of life lost from noncombat sources current or last turn by players. * This watcher is automatically started in gameImpl.init for each game diff --git a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java index 1b13d0957dd..7b4470014a0 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java @@ -1,16 +1,15 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - /* * Counts amount of life lost current or last turn by players. * This watcher is automatically started in gameImpl.init for each game diff --git a/Mage/src/main/java/mage/watchers/common/PlayersAttackedLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayersAttackedLastTurnWatcher.java index 2b5f73c08a4..44d58a381d8 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayersAttackedLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayersAttackedLastTurnWatcher.java @@ -8,8 +8,8 @@ import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; -import mage.watchers.Watcher; import mage.players.PlayerList; +import mage.watchers.Watcher; /** * @author spjspj diff --git a/Mage/src/main/java/mage/watchers/common/PlayersAttackedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayersAttackedThisTurnWatcher.java index fe39ea98e88..1c735f71285 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayersAttackedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayersAttackedThisTurnWatcher.java @@ -1,15 +1,15 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.PlayerList; import mage.watchers.Watcher; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - /** * @author JayDi85 */ diff --git a/Mage/src/main/java/mage/watchers/common/ProwlWatcher.java b/Mage/src/main/java/mage/watchers/common/ProwlWatcher.java index f7c13409049..2a88c455663 100644 --- a/Mage/src/main/java/mage/watchers/common/ProwlWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/ProwlWatcher.java @@ -1,6 +1,13 @@ package mage.watchers.common; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + import mage.abilities.keyword.ChangelingAbility; import mage.constants.SubType; import mage.constants.WatcherScope; @@ -11,9 +18,6 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.watchers.Watcher; -import java.util.*; -import java.util.Map.Entry; - /** * Watcher stores with which creature subtypes a player made combat damage to * other players during a turn. diff --git a/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java b/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java index b2fb2e4ab79..1a473809489 100644 --- a/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java @@ -1,5 +1,9 @@ package mage.watchers.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.constants.Zone; import mage.game.Game; @@ -9,10 +13,6 @@ import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; 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/src/main/java/mage/watchers/common/SourceDidDamageWatcher.java b/Mage/src/main/java/mage/watchers/common/SourceDidDamageWatcher.java index f338ea1cb02..bf9ffc89408 100644 --- a/Mage/src/main/java/mage/watchers/common/SourceDidDamageWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/SourceDidDamageWatcher.java @@ -1,14 +1,16 @@ package mage.watchers.common; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.watchers.Watcher; -import java.util.*; - /** * Watcher stores which sources did damage to anything. * diff --git a/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java b/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java index 883ab6f9ef6..c33d1cf41a4 100644 --- a/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java @@ -5,7 +5,11 @@ */ package mage.watchers.common; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import mage.MageObject; import mage.constants.WatcherScope; diff --git a/Mage/src/main/java/mage/watchers/common/WasBlockedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/WasBlockedThisTurnWatcher.java index 89ad6edb0dd..da2d3be8a50 100644 --- a/Mage/src/main/java/mage/watchers/common/WasBlockedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/WasBlockedThisTurnWatcher.java @@ -1,15 +1,15 @@ package mage.watchers.common; +import java.util.HashSet; +import java.util.Set; + import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; -import java.util.HashSet; -import java.util.Set; - /** * * @author noahg diff --git a/Mage/src/test/java/mage/ContinuousEffectImplTest.java b/Mage/src/test/java/mage/ContinuousEffectImplTest.java index 8c48825e76a..d49cf4a5265 100644 --- a/Mage/src/test/java/mage/ContinuousEffectImplTest.java +++ b/Mage/src/test/java/mage/ContinuousEffectImplTest.java @@ -1,16 +1,17 @@ package mage; -import mage.abilities.effects.common.continuous.BoostTargetEffect; -import mage.constants.DependencyType; -import mage.constants.Duration; -import org.junit.Assert; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.is; import java.util.ArrayList; import java.util.Set; import java.util.UUID; -import static org.hamcrest.CoreMatchers.is; +import org.junit.Assert; +import org.junit.Test; + +import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.constants.DependencyType; +import mage.constants.Duration; /** * Created by IGOUDT on 25-2-2017. diff --git a/Mage/src/test/java/mage/ManaSymbolTest.java b/Mage/src/test/java/mage/ManaSymbolTest.java index 6d12ac4de4b..8ebe7d897bd 100644 --- a/Mage/src/test/java/mage/ManaSymbolTest.java +++ b/Mage/src/test/java/mage/ManaSymbolTest.java @@ -1,8 +1,10 @@ package mage; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -import static org.junit.Assert.*; +import org.junit.Test; /** * Custom unit tests for {@link ManaSymbol} diff --git a/Mage/src/test/java/mage/ManaTest.java b/Mage/src/test/java/mage/ManaTest.java index 9f971bddc4c..4baddfaba02 100644 --- a/Mage/src/test/java/mage/ManaTest.java +++ b/Mage/src/test/java/mage/ManaTest.java @@ -1,14 +1,16 @@ package mage; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + import mage.constants.ColoredManaSymbol; import mage.constants.ManaType; import mage.filter.FilterMana; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotSame; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; /** diff --git a/Mage/src/test/java/mage/cards/decks/exporter/MtgOnlineDeckExporterTest.java b/Mage/src/test/java/mage/cards/decks/exporter/MtgOnlineDeckExporterTest.java index 7deb0cb70e6..96a75d3eb24 100644 --- a/Mage/src/test/java/mage/cards/decks/exporter/MtgOnlineDeckExporterTest.java +++ b/Mage/src/test/java/mage/cards/decks/exporter/MtgOnlineDeckExporterTest.java @@ -1,13 +1,14 @@ package mage.cards.decks.exporter; -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLists; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import org.junit.Test; + +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLists; public class MtgOnlineDeckExporterTest { diff --git a/Mage/src/test/java/mage/cards/decks/exporter/XmageDeckExporterTest.java b/Mage/src/test/java/mage/cards/decks/exporter/XmageDeckExporterTest.java index f905f63a0e4..767346d37c3 100644 --- a/Mage/src/test/java/mage/cards/decks/exporter/XmageDeckExporterTest.java +++ b/Mage/src/test/java/mage/cards/decks/exporter/XmageDeckExporterTest.java @@ -1,13 +1,14 @@ package mage.cards.decks.exporter; -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLists; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import org.junit.Test; + +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLists; public class XmageDeckExporterTest { diff --git a/Mage/src/test/java/mage/cards/decks/importer/DraftLogImporterTest.java b/Mage/src/test/java/mage/cards/decks/importer/DraftLogImporterTest.java index 7c64308dd40..84d58e1dde1 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/DraftLogImporterTest.java +++ b/Mage/src/test/java/mage/cards/decks/importer/DraftLogImporterTest.java @@ -1,9 +1,10 @@ package mage.cards.decks.importer; -import mage.cards.decks.DeckCardLists; +import static org.junit.Assert.assertEquals; + import org.junit.Test; -import static org.junit.Assert.*; +import mage.cards.decks.DeckCardLists; public class DraftLogImporterTest { diff --git a/Mage/src/test/java/mage/cards/decks/importer/MtgaImporterTest.java b/Mage/src/test/java/mage/cards/decks/importer/MtgaImporterTest.java index 2db8dea4047..6256f624625 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/MtgaImporterTest.java +++ b/Mage/src/test/java/mage/cards/decks/importer/MtgaImporterTest.java @@ -1,11 +1,10 @@ package mage.cards.decks.importer; -import mage.cards.decks.DeckCardLists; +import static org.junit.Assert.assertEquals; + import org.junit.Test; -import java.io.File; - -import static org.junit.Assert.*; +import mage.cards.decks.DeckCardLists; public class MtgaImporterTest { diff --git a/Mage/src/test/java/mage/cards/decks/importer/MwsDeckImportTest.java b/Mage/src/test/java/mage/cards/decks/importer/MwsDeckImportTest.java index cf364d81080..cce220790ec 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/MwsDeckImportTest.java +++ b/Mage/src/test/java/mage/cards/decks/importer/MwsDeckImportTest.java @@ -2,14 +2,9 @@ package mage.cards.decks.importer; import static org.junit.Assert.assertEquals; -import java.util.Collections; -import java.util.List; - import org.junit.Test; import mage.cards.decks.DeckCardLists; -import mage.cards.repository.CardCriteria; -import mage.cards.repository.CardInfo; public class MwsDeckImportTest { diff --git a/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java b/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java index e4f25432391..8f4e744fee1 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java +++ b/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java @@ -6,8 +6,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Assert; - import mage.cards.decks.DeckCardLists; public class TestDeckChecker { diff --git a/Mage/src/test/java/mage/counters/CounterTest.java b/Mage/src/test/java/mage/counters/CounterTest.java index 2bf57a6d369..4d971ee7d6d 100644 --- a/Mage/src/test/java/mage/counters/CounterTest.java +++ b/Mage/src/test/java/mage/counters/CounterTest.java @@ -1,6 +1,8 @@ package mage.counters; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; + import org.junit.Before; import org.junit.Test;